Quick and dirty test fixes

Go round the following issues, so that `bin/test --ios71` works:
- https://github.com/appium/appium/issues/2132#issuecomment-38472997
- https://github.com/appium/appium/issues/2129#issuecomment-38475071