Corrected off by one error introduced in previous fix.

Also added --pserver and --pport options to test server so that
you can test more realistic scenarios with multiple servers rather
than just one.