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

Adds unit tests for the doughnut & line controllers + line controller updates