Fix the desktop test suite.