Merge "Fixed test failures for notification comparator"