am a2d1469c: Merge "Use new defines in test code."

* commit 'a2d1469c773d809261d830d2f3cb3f6a7b6cdade':
  Use new defines in test code.