[BUGFIX beta] Failing tests for instrument without payload
[BUGFIX beta] Support instrument without payload