Moved PortFinder from test to main.