fix initialization test static state dependency
Merge pull request #608 from metamx/fix-initialization-test

fix initialization test static state dependency
fix bridge test
Merge pull request #609 from metamx/fix-bridge

fix bridge test
fix broken ut
fix more test breakage
fix linux test failures