Fix issues running macro tests

This seems to have simultaneously broken for both @Archdoog and I and we don't know why ;)

Some steps we've discussed to resolve:

* Recreate the project from scratch using the latest macro templates; could be that we screwed something up / things changed along the way in a patch release
* Try the latest Xcode beta to see if it's an Apple bug that's fixed