handler fixes for tests
Juan Batiz-Benet authored
26c4e500