PayloadParser refactor

Need to refactor a few more tests. Otherwise, this is done.
See above.