SZ-94: updated tests and some issues for iOS 8
Missed this