Phase 2 of test file cleanup: relocating test files from FrameworkTest closer...

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

In addition to the file moves, the package names of the tests have been updated and adjusted to match their new locations.