Update ITN testing utility for new EncodingManager
Fix some ITN tests after the pull from upstream