Fix 'Unit test target launches app'

#1885

This MR symptomatically fixes the issue.

I'm not completely certain of these changes; someone more familiar with the project might find some issues that I can't see. All targets seem to work though.