Update tests to latest protocol changes (PoC7)
Merge remote-tracking branch 'origin/develop' into develop