That should be my final draft. All unit-tests are now working again