Add Code Coverage and finish controller tests