Remove any remaining dependencies on n-t-tcp in test suites.