Make tests pass with new behaviour