added controller tests and some improvements
Merge pull request #1 from leandroalemao/add_controllers_test

added controller tests and some improvements