Switch to 3001 and DRY port definition
Reorganize test suite