I don't think having longer functions makes for more testable code. I moved all the handlers to separate functions on purpose: smaller external functions are easier to test than internal ones. One of this days we will have to share opinions about coding style, for our visions on that subject clearly differ :)