Fixing up TestBatchTcp to no longer point to TestBatch