fixed issues with Xcode6-Beta4 tests