Step-4: Added the new test fr the controller and refactored a few names of things