Swap order of parent::tearDown() to attempt getting thanks tests working

Change-Id: I142a0ba5ead63dd36049e90ccbb2f9858e325301
Merge "Swap order of parent::tearDown() to attempt getting thanks tests working"