Adds tests + Fixes one use case
Merge pull request #2 from BluePyth/tests

Adds tests + Fixes one use case