Fix failing master
Merge pull request #55 from cibernox/fix_tests

Fix failing master