Only testFillParserOutput() and testPreSaveTransform() require integration Also cleanup the left behind code Change-Id: I0e0638eb5ff71374a1103f2d197b75b09e518662