#38 Convert handler tests - last ones