Fixed up some failing tests in the unit/ directory. Failures came from still using the old "herd" terminology.