Removed dependency on NSObject-SafeExpectations