Improved tests for oracle and postgres