Update tests to use newer helpers. (@hodgestar)