Follow-on unit test fix up (more from #20)