Applied recent protocol changes (PoC7) to existin tests