Add in test for merging directories