Removed tests and consistent naming with Dropbox