Add missing addressing forms to tests.