Test delivery information missing, unknown status codes.
Add Bundle configuration.
Add service definitions.
Fix indentation.