Making failing tests pass.