Fixes to test helper.