Restore Windows FS loading for tests
deprecated methods and classes removed from API