Making our tests pass again