Merge "Add and Modify JUnits for Code Coverage (components, controller)"