Made some changes to the tests