Fixing up existing inventory tests (all clear)