Fixed some more test issues