hush: fix some fallout from prev commits, add testsuite

3 files changed