Merge "Add more cts tests"