Refactoring of default controller
Functional tests