Fixed criterion handler construction in test