cleaned up tests