rename handler
give tests the possibility to fail