Update dependencies

Also added to the tests to improve coverage.