tests pass now
more tests