Merge "Fixing some more CTS pring tests."