reorganizes test files
reorganizes test files