Make the old tests pass