added test harness code fixes #2