Improve test error handling
Test on iOS 6.1