changed hash to string in mock
pull upstream test fixes