Reduce duplication by using #process_struct from #process_exception
Reduce duplication in test_client
Remove abort_on_exception
Handle missing field values
Fix merge conflicts