Plus maybe final fix for the failing tests.
This will create a new commit in order to revert the existing changes.
