even more tests fixing