Allow for more flexible unit tests

[bruno-brant]

Given that the framework leads us to use highly coupled dependencies and makes use of a non-mockable service locator, it is very hard to create good unit tests.