handler test tweaks