Restructuring testing files