fix the insanely annnoying maskiterator bug
tests update