Clarified comments and simplified import call
Clear directory source pref in registered cleanup and return a promise resolved when pref is cleared
Test harness will wait until the promise is resolved
Make observers a Set object