Merge "Keep only clean TestCases, remove 2 license issues"