Simplify test skipping

Change-Id: I45ca4998e50f60849f6f44544f3c8d22f33ac91c
27 files changed