rename handler to make sure it's exported
add tests