Make YAML matching more robust in usage acceptance tests