Renamed to monitoring system
Updated test