Changed and added all the tests