fix even more tests