More tests, more coverage, and trying to prevent dangerous send