[Feature]: Fix all tests

[CWillberg]

What are you trying to do and how would you want to do it differently?

I would like to fix the test broken by the code improvements.

Is it something you currently cannot do? Is this related to an issue/problem?

changes in code structure lead to massive test fails.

Implementation details

adapt the code to the new strucutre

Would you be willing to submit a PR?

Yes