Update deps
Fix test's test and clean code