issue #22067: return model tests pass