Fix tests and Deps
fix