PayloadParser tests are refactored