Merge "Fix issues in long and double testing (cts)."