[Issue #77][Issue #205] Finished controller tests