Merge "Revert "Port mode configuration test - II""