Fixed all the tests