Do not rewrap tester if there are no ArrangingTester adapters
Refactor ServiceContainer::splitServices()
Fix order in which wrappers applied

Interface of the wrappers is not as important as their defined order