samsieber Fix test harness bugs; replicate branch confusion issue

Latest commit ea6d5c9

Dec 11, 2018