Fix for more tests