add test cases for combined csfic+parametric GP
fixes for non-csfic models