Working to add some unit tests for bridging.