Update/add more tests.. Update deps.