Platform independence for SI-6240 test case

File.pathSeparator, rather than ":"
Merge pull request #3064 from retronym/topic/broken-windows2

Platform independence for  test case
Moving disabled tests to their rightful home.

  test/disabled, not test/files/disabled.
Merge pull request #3067 from retronym/ticket/7020-2

Moving disabled tests to their rightful home.