Impovements tests + fixed iteration bugs