Fixed tests failing in pgsql because of used of a reserved keyword