Added more tests.  Started to work on the SQL testing.