ResourceContainer is now inherited by mapobjects with storage, and renamed storageUnit. Farmtest passes.