implementing more of the test suite