Fixing unit tests for xcode 5.1
Merge branch 'crash' into miya-offline