Merge "Removing an extraneous test" into qt-dev