Added more test database code