test runner code OK, needs polishing