Make tests pass (thanks skip).