removed need for friend declaration of test class in Preprocessor / cleanups

removed need for friend declaration of test class in Preprocessor / cleanups #20542