Fixup test-requirements.
Fixup test_setup for pbr usage.
Allow setting the server port on the command line.