Fix tests with latest releases of testtools

Change-Id: Ic137ed2caa66c87d79aa52d38e60b4ad0febcb29