test3 done and fs deleteDirectory changed a little
conflict fix