fixed logging macro, more update on tcp machine, separated test