Got the test suite to pass on 2.10
Added the bridge rewiring as a test