Cleaning up tests, adding all odata options to oquery