Added capture close test (highlight breaking case)
Monitoring changes to try and identify connection close
Refactor coupling logic based on monitoring changes
Include capture close tests
Accept disconnect as well as close