More modeling tests, rewrite of trained features, cleaned up estimators
Added shortcuts, all tests now passing