[Issue #165][WIP] Finished controller tests