Fix YAML mockup tags
Merge remote-tracking branch 'origin/refactor-json' into refactor-json

Conflicts:
	tests/gcd/gcd.yaml