PayloadParser refactor

Need to refactor a few more tests. Otherwise, this is done.
This test is meant to assure that payload parser is not too greedy and does not eat following payload. Probably not needed in current (tree) situation and can be removed.