Added back the rest of the test suite