Refactored bonjour integration into separate methods.  Started a refactor on test cases - WIP.