more tests passing, more test coverage