Add better skip support

Follow-on to previous patch, matching skipIf/skipUnless too

Change-Id: Ifbe5650cddccdb05d13da066a9f0d3570ae69cfc