Fixing unit tests
Merge pull request #2 from neontv/testfix

Fixing unit tests