fix kalitka option
fix test1 problems