[TASK] Fully cover Payload with tests