Update SkipTest logic to rely on PROTOCOL_VERSION
Update SkipTest logic to rely on PROTOCOL_VERSION