Some minor inventory updates
Added some inventory tests