Add the rest of the tests