Cleaning up controller tests