Simplify scope-test and fix bug in the use of hooks + sync drivers