Working on tests, fine tuning Config Locator.