More test database cleanup.