testtools: Import new upstream snapshot.