Omit calls using CGPoint and CGRect for the moment
Fix some tests and fail some