fixing tests
cleaning