Fixing desktop build
Restoring some lost unit tests