fixed broken tests and other things for Xcode 6 beta 5