updates to SQL-based tests