Get rid of ph::cs and compute test