reorganized test files