Merge pull request #10 from surangak/unit-test-pt1

Addining initial unit tests