fixing tests
finish fixing tests