Add/Fix Unit Tests
Merge pull request #50 from syhc/master

Add/Fix Unit Tests