Update deps
improve functional tests