Add handshake injection test and fix modularized code
- there is also a rough draft sketch of a concurrent flow tracking
but this isn't working properly yet