testtools: Merge in new upstream.