Fix url name in tests
Add util.merge_folder function