Merge "Desktop tests: re-add functional test classes" into main