Allow different kind of servers
Change test function to allow different ports