Adds dropbox and drive support
Test includes drive and dropbox