Straggling changes for octest -> xctest
Get build passing after brew upgrade on Travis