Fixed all of the tests