Updated for unified ECConf/ECUnitTests/ECLogging