Merge pull request #1426 from etimberg/feature/unit-test

Tests for the bar controller + bug fixes