Reorganized testing files