Merge "PreprocessorTest: test both implementations"