Fixing tests
cleaning up tests