fix portable mode detection #3670
fix folder structure for validation test