unit tests pass now