Fixed some more tests ...