Some temp exceptions, tests, and not using dict() for payload