NOTASK fix(misc)

- fix misc bugs left behind after refactor
Merge pull request #16 from ikhattab/fix-misc

NOTASK fix(misc)
NOTASK test(pushHandler) added tests

- tweak the implementation for `pushHandler`
- add tests for `pushHandler`