Merge pull request #23 from jboverfelt/sql-test

Test fixes