Updates to test database handling.