Refactored / Moved /Added controller tests