cleaned up tests a bit