80/layout controller unit tests

Write & fix unit tests for LayoutController. This PR fixes build.