8025968: Integrate test improvements made in lambda repo

Reviewed-by: psandoz
3 files changed