Unit tests added
Merge origin/master
Unit tests added v2