Make tests pass
All tests pass locally