Add Form::controller, update tests