Fixed id
Added more tests. Inventory fixes