Fix small problems with the ObjectStorageAPI
Improve integration tests