Merge pull request #1335 from wfrench/master

Framework for end to end dataset tests