Force payload to correct format in func tests from any start state.
Fix indentation.