Implement itemized storage and more tests