Merge "Fixes test that is currently failing" into qt-dev