Updated tests, also handling Oracle queries different from SQL Server