Fixes for CPR with poorly-formed covariates
Cleaned new test case