Locked down some dependencies and updated user-based tests