adjusted the merchant/item integration tests to load using item builder
merging changes