Merge "Phase 2 of test file cleanup: relocating test files from FrameworkTest closer to their sources in core."