update forms and tests to check for duplicates