fixing some more tests