Final refactor with some more mock testing around the HomeController.cs