More odata test fixes.