Disable test completely if requested

Change-Id: I833d7aff16fd20e9e7003f3afdc0f65dca12d23b