Fixed failing GenericSqlTest - take 2.