Merge "Make test correct." into lmp-dev