Missed some queries when restructuring with.sql tests