Merge "Adapt protocol and skip tests depending on config"