[SJS-170][TEST]: Merge issue test fixes