I see we copy+paste this class around everywhere. Can we just move a canonical into the -kernel test jar, or is there a good reason we do this?