Make tests pass.