Rollback test changes to call port_number for now