Merge "Fix the broken unit tests" into lmp-dev