Finish up controller tests