improve code in MonitorSuite