encapsulated handler into ssandreta package and updated test references