About a dozen test/suite files now use extensions, but they use local functions to accomplish this. There's an opportunity for sharing code and cleaning up.