Merge "Test case clean up." into qt-dev