JASCIS-70: Add selection of correct handler with test