fixed up some deps and tests