Unit test cases implemented
Merge from devlopment branch