Update tests to work with the latest testtools

Testtools has been updated recently. Unit tests updated
to work with the latest version.

Fixes bug: 1248896

Change-Id: If4d71a394b2f9b7f5f1b612ae19273de7bec54ce