Merge "Improve some tests" into lmp-mr1-ub-dev