Making tests pass again