Loader, subdirectories fix, enable LoaderTest