Fixed errors with Unit tests.
Merge pull request #9 from Unicon/tests

Tests: Fixed errors with Unit tests.