Merge "Simplify Exception expressions in CSTest"