am 64816d53: am a00457a6: Merge "Add one more test and update old tests" into lmp-dev

* commit '64816d534c0bc42f5e83bd24bb6c452f61e61fdc':
  Add one more test and update old tests