TO_SQUASH_IT optimize args generation + minor fix +tests