Updated tests to fix newly named form types