Yet another fix to the tests