Minor cleanup and finished controller tests