Merge "cts: Add all tests to general-tests"