am 217c7c93: Merge "Removed Old*Test for integers and longs"

* commit '217c7c93cc461d174aec997fc89c4ed37e2cd989':
  Removed Old*Test for integers and longs