fixing up style, updating test harness