Added controller and helper tests