Cleaning up InventoryMessageTests a bit.