Finished test helper stuff and wrote a test with it
Merge branch 'm-delta' into s-delta