Merge "Add missing tests - missed during addressing merge conflicts" into tm-mainline-prod