Units - Added tests to the controller and modified template.