Switch style tests to use helper util.