Updates tests for new forms