@jcredding nice side effect of this change is we don't need any of the test helper junk anymore.