Cleaned up InventoryMessage and test.