Updated the code to make use of autowired service layer and dao layer, as well as moving away from some mock objects