Make tests pass on 0.2