[Issue #174][WIP] Finished controller tests