Fix the tests
updaged version