Minor cleanup of tests.

Commenting and organized imports.
Fix test suite by setting a different database name for CacheTest.

This was causing an issue with the rest of the test suite, which was not passing because only CacheTestModel and CacheTestModel2 were in the database.