Merge "Improve test coverage in SdcSingleController"