old_return added and tests adjusted