Ensure ids are correct in tests' storage_data

Also add an "objects" dict to easily retrieve available objects from their
object_type.