Remove the last SQL statements from the tests; Note that this uncovered
a new failure (see next commit for fix)