Fixed handler bugs / more additions to test harness