Prepare for second transport method; update tests.