Unit tests are passing so far.
Use file name for desktop name instead of embedded name.