Tear down test database after test suite, refactor CJ names out