Expanding code coverage on controllers

There is still more to do