A test harness
Use standard convention for documenting args
Merge branch 'test-harness'