Updated the rest of the tests (hopefully)