Generalized CP added, but still working to confirm accuracy of both cp tests