Changes for better coverage
added pagerduty schedules to config
fixes for issue OPS-3 and refactoring for best practice