hk: refactor test suite to ammend glitched test