cleaning up tests
fix tests