added getContainer and tests, refactored getStorage and added extra tests