Fixing some more tests...