Merge "Improve unit test coverage of LoopService"