Followup fix for: Ability to start all modules in their correct order -
TRUNK-4438
Back ported TRUNK-3586 Update unit testing environment to use mocks