Made  be the last argument
Created tests for the handler callback