Updated test folders