SQL-related tests updates. Fixes #202. Fixes #203.
Merge pull request #206 from drothenberg/ind_sql_202_203

SQL-related tests updates. Fixes #202. Fixes #203.