dir load support + testset 2 + minor