A linking change in Xcode 6.1 means command-line tools don't work (easily) with frameworks.

The command-line tools were changed accordingly.
Fix a copy-paste oversight in two test cases.