Added controller tests
Removed Magic Number Violation