also change the 2p model to "smart primary variables" and rate vectors and make the 2p and 2p2c test problems model agnostic