New test to cover missed scenario.

Start pulling apart the ControllerTest.