Addressed Ben's feedback; added an empty iteration unittest.
Also fixed data race in the unittest.