Add tests for controller
Unit tests corrections
Merge pull request #6 from M6Web/controller-tests

Add tests for controller