Add additional form-field tests
Return form-field mapping list instead of form-field itself