Loopers fixes. + tests