Test forEach and some fix