PM/Restructered test folders