Point the controller to the right template includes functional and integration test
fixes #36 (closed)