This also sets up some integration test
helpers for diffs which will be helpful
in the long run