remove test that was non-deterministic. json key ordering different in iOS6 and iOS7 SDKs
Merge branch 'master' into notif-tracking-timestamp