Updated deps, fixed/improved tests.