Updated dev deps, and properly fixed tests - ref 76b314e0fb440942ce97c34834ccf3fe9ccd64df