Add new test harness
Merge branch 'pr/7'