Validate test on filesystem except one
Merge remote-tracking branch 'origin/erik' into dev
fix