speed up tests
clean up some duplicated logic
always caught in the connection now
source address checking has been centralized
strict is not so special
Merge pull request #406 from jschneier/cleanup

Cleanup duplicated and inconsistent logic.