Updating tests, deps, fixing small bug