Improved tests
About to refactor controller
Refactored controller to have only two actions