Added db tables and queries for test run