Fix cli-test for new port scheme.