Make tests pass for 3.2