Add unit tests
Use alternative way of iterating items
Merge remote-tracking branch 'origin/master'