more tests pass
probably all works