Refactoring resource storage, item, and collection tests