Add manually-moved lp test changes from merge