Merge "Add tests to Inventory module"