merge test folders