Neaten up tests