control point tests pass after mucho refactoring of models.