Merge "Update Sample Tests" into lmp-dev