Fixed some test. Added a run that support Int64