Adding matcher of valueOf
(cherry-picked from c52ce69)