Merge "Remove TODOs for adding CTS tests."