Fixing tests
Merge pull request #99 from alxdarksage/develop

Fixing tests