Fixing some more tests