Don't need TokenizerTest patch anymore (upstream BEAM noticed the problem)
add virtual image hint