Working on generalizing regression
Clean up regression for main effects model
Remove some defunct tests