Updates to try and use xctool over xcodebuild