Improving tst and fixing issue #20 (again)
Remove unneccesary private method and place it inline with the sole caller.

Validates assumption that it is only ever called when the state is
currently in yaml.
Merge pull request #24 from ranford/master

Improving test and fixing issue #20 (again)