Replace int64 conversion to EqualValues in tests