add Handler and Finder with units tests