Added another testcase and started to look into the changes required to get the payload working correctly.