Merge "Fixing SO-Monitoring UI tests"