Fixing foreach tests
Merging