Increased controller code coverage to > 90%