Merge "reorganization of Test folder in Releng"