Add handlerList & updated test.