Replaced methods with PreProcessorUtil methods. Added tests