Removal of extraneous header comment
Spec refactor for succinctness

Leveraging regex patterns in order to provide flexible tests
expectations.