Reorganizing the way we test joint math.