Merge pull request #2 from dlink/unit_tests

Added Unit Tests