PayloadParser refactor

Need to refactor a few more tests. Otherwise, this is done.
Is the 10 spaces intentional here? Should be just 8.