Unit tests pass now