Fix tests for running against the desktop client

I recently introduced a regression when running against the desktop builds. This pull addresses that, and makes a couple of other necessary changes.