This will allow to progress incrementally towards removing it.
When it allows to use BaseModel objects everywhere (and tests in test_storage
are adapted to use this property), it will be time to remove it entirely (as
it's only used in test).
It's preparatory work for future diffs.