Working on TestYamlCombiner, small fixes in YamlCombiner and
SimpleYamlManager.