Adding address classes updating test.