PayloadParser refactor

Need to refactor a few more tests. Otherwise, this is done.
Same as above - different scenario. Can be removed.