Added the rest of the tests