made some changes to the HandlerBase class and test. needs review.