Change BuildingMock to UnrestrictedStorageMock to avoid future namespace collisions.