Monitoring rules and modified tests
Added monitoring rules