Moving expected template to subdirectory

As we plan to expand what we test regarding persistence, I want to have
a directory structure that can reflect these requirements.
Adding wrapper method to encapsulate knowledge

There were two locations in which I was passing rather intimate
knowledge of the required parameters to a test spec. By creating a
wrapper function I can encapsulate that behavior.

Also, through the encapsulation, I can began to expand the verification
to test more than a single datastream