Port numbers no longer hard coded.
Increased timeout for test.

It still may not be enough, but it passes more often now.