Fix broken unit tests

[hechth]

Seems like the changes on upstream have broken the tests.

We need to find out which changes broke the tests, which tests are broken and if they can be easily fixed or not. We then have to decide whether we will update the tests to comply with the new changes or vice versa.