Support for Xcode 6.1, fix tests cases errors, Merge changes from master branch