Restore tcp modules (+tests)
XD-915: Apply to tcp modules