Updated databasequeries and databasequeries test, fixed imports