Fix the tests

and here