more cts testing fixes