Fix ODatat tests and remove/sort usings