fix client test, fix message correctness
Merge branch 'master' of https://github.com/mmcilroy/hulk-fix