1) Make tests pass