Merge "Increase test coverage for SO MON UI"