XCPANTS-1556: fixup tests with httmock