#4443 - Modify tests a bit. Remove unnecessary ones
#4443 - Replace forEach with a regular for loop