Unbreak basic.reject, basic.nack and basic.recover. Fix up specs.