Desktop tests reorganized