Finish adapting configurator to unittesting/rid project errors