Fix compilation of tests
Improve adding file system paths

 - Check that path is not already added
 - Use name containing incremental index for external devices