Update deps and fix tests
Merge pull request #2 from BenWhitehead/update-deps

Update deps and fix tests