am b1771617: Merge "Improve some tests" into lmp-mr1-ub-dev

* commit 'b1771617164fa8608bfc4b461a50888d51be4763':
  Improve some tests