Merge "Improve unit test coverage of LoopController"