Reorganise tests; Add PortBlocker util.