Refactored ObjectArrayStorage around ObjectStorage, added tests