working on tests
A couple more tests pass