more cleanups in the code.  not sure about the db.close() when setting a new database in the Database object but we'll see.  Actually start closing the database connections in the tests which allows our tests to run faster and without blocking.