Make tests pass (mark one TODO).