retry in controller
Extract some concerns
more fleshing-out of failed UI and start of int test