Replace tsutil.decapitate in tests #2269
Description
There is currently a function called decapitate which does something slightly different to the definition in #2240. It would be better to remove this test function and replace it's usages with the new method. Should be a straightforward job.