Caught up on controller tests