Fixed unit tests for payload