Make tests passing.