[Issue #174][WIP] finished controller tests