Merge "Update and broaden @covers for PreprocessorTest"