Fix a bug and a few book keeping items

 Issue #2 - tests missing from tarball
 Issue #4 - gracefully handle missing brokerid