Bug 891109 - add 'before' and 'after' to test harness