Update dependencies, add extra tests

More minor fixes and tests