Several changes and add-ons... have to fix a heisenbug: test execution is hanging sometimes