Move ChiSquare into Trait