First TCP tests and some cleanup.