reorganization in test files