tests pass now