Simplified the TcpTuple code and added some testing for it