Merge pull request #1 from sourcefuse/master

Error Fixes from origin
Added test cases
Merge pull request #2 from slaith/master

Added some test cases and basic test structure