PayloadParser refactor

Need to refactor a few more tests. Otherwise, this is done.
We are doing this in the old parser. I thought let's stick with that.