Great simplification of regression framework ought to fix make test problems on some platforms