Clean up deprecations; make tests pass again
Merge pull request #2 from retupmoca/master

Clean up deprecations; make tests pass again