Make things more testable
Delete some unused methods
Setup ConductorManager tests (and add first one)