JUnit for Dropbox, codeCoverege 89%
Cosmetic changes for constants
fix merge