Fixes to handler system, updated textmaphandler test