Iterate and add unit tests