Move test files to main files