Fixing tests to reflect changes in payload handling