Adding matcher of valueOf
(cherry-picked from 14f7952)