[WIP] Fixing tests and data fixtures

Following recent change to database structure, tests and data fixtures require updating. 

Linked to #180