Migrate topology func. tests to RFC8040 Step 3