Fixed some more tests