Added controllers, bootstrap stuff and more test cases for getting a
good coverage.