Consolidate test files.