Faster tests

Some minor improvements to the tests. Mainly to try and avoid doing duplicated work across tests. Not a huge saving, of the order ~20%.