Related to #3420759
Renamed a bunch of test classes here, because this introduced the first "non-Config-Overlay" (in the sense of not using the test trait) test, so hopefully this will make things clearer.