db_test cleaned up