Major refactor on the yaml outline.  Tweaked test template as a result.