Putting in more unit test for bridging.