Merge "[Settings] Remove failure JUnit test cases"