Fix for tests not exiting when running the desktop tests and added some more desktop conditionals around the mouse support.