Merge "Add StorageManagerTest to TEST_MAPPING" into main