Fixes to ensure mocks are always reset within dropbox tests