Full controller code coverage. Close #24