More progress with YAML-based compariosn