Small fixes to pass the test (with psql)