US-6: some fixes
Add test for controller.