Fix the tests to work as expected