DATAES-91 - fixed payload feature, added corresponding unit tests to cover it, fixed code format