Repair thanks tests

Change-Id: Ia0b34ece38ae219e5ee2c49b3d98490a503f536b
Merge "Repair thanks tests"