Included ADF test
Minor adjustment on ADF
Included not versioned files and more work on ADF