Some more clean-up in unit test helpers code.