fixing tests
tests passing