Added initial unit tests.
Merge branch 'develop' into issue-25
Update unit tests for latest changes in issue-3-addition branch
Merge branch 'issue-25' into develop