Remove original Inventory implementation. Fix tests to reflect and all pass.