Fixed Unit tests
Merge pull request #15 from Neozaru/tests

Fixed Unit tests