[JBTM-1611] QA test suite fixes when running with the HQ Store