Update to use new helper and tester.