Relocated test files to bottom