Refactor CompositionRoot; begin import options tests.