Updated affix file and tests for personal forms