Updates based on code review.

* Rename `args` -> `kwargs`
* Add new tests and make handlers return different values.