Fix deprecation warnings, fix tests
Merge pull request #7 from retupmoca/master

Fix deprecation warnings, fix tests