One more fix to the tests