Fix Broken Tests
Merge branch 'master' of https://github.com/nmwilson/J3NI

Conflicts:
src/MsgHandler.h
Merge
Merge