Hating dbschema x 2
Fixing populate_test_db.sql and test_setup.py to reflect last changes on db schema