Merge "test: Fix 593-checker-shift-and-simplifier for target"