🔀 Merge branch 'refactoring/increase-testability' into next

I’m not sure why I have not made all these changes on next, next is the
perfect branch for this. :)