Merge "Improvements on CtsProviderTestCases." into qt-dev