Bring dependencies up to date and fix tests accordingly. Closes #93.
Merge pull request #114 from repotag/93-update-dependencies

Bring dependencies up to date and fix tests accordingly. Closes #93.