Can you revert this and use constructor injection instead? 

The tests fail with a fatal exactly because of that