fixing even more tests