Added more test for each with map