Added more test for each