Bring in new faketcpserver.
Fixing some bugs in last commit.