Added Test Coverage for handlers