Cleanup per tim's peer review

* Missed yaml header in some files '---'
* Added named tasks to decrease test line count