Finish up handler tests
Fixed up form message TODOs
Filter reports to cancel by connection