Reduce duplication in tests

[betatim]

This is a bit of a vague issue. A lot of the test code duplicates things, this will/has lead to bugs and is hard to maintain.

We should explore options to reduce this without making the tests harder to understand (no one likes debugging the tests while debugging real code)