Cleaning up tests a wee bit