Merge "Fix tests with nonpublic setup methods" into qt-dev