Fixed some test cases for ODataTestSuite