Merge test folders