Bug 957923 - Fix unit tests for running in DESKTOP=1 environment.