PayloadParser refactor

Need to refactor a few more tests. Otherwise, this is done.
We have removed deprecated "Object" so its OK to remove this test.