more tests, all tests passing.