jh - fixed duplicate test names exposed by running under 2.0.