Fix test packages. Upgrade two dependencies