Add tests for extra fields and fix discovered issue with config rendering
Fix resume test
Merge branch 'features/extra_field_tests' into develop