Fixed some of the tests