More tests
Merge pull request #5 from kirs/controller-tests

More tests