Make tests pass again