Fix broken tests
Merge branch 'backend-branch' of https://github.com/Hackfmi/Diaphanum into backend-branch