Why does this need a class? Most (all?) of our testing uses `test_xyz()` functions.