Calling get_base_object is no longer needed, this speeds things up by not unnecessarily downloading metadata.
And adjust tests to match.