Fix skips done in the test suite by using testtools skipIf

The shipped skip_if function was broken as skipIf is already a
decorator.

Change-Id: Ifc5c3a7878fa047fe1a807c43d91fe34bc7b4081
Merge "Fix skips done in the test suite by using testtools skipIf"