New droplet build.
Fix tests.
Merge branch 'droplet'

* droplet:
  Fix tests.
  New droplet build.
Fix test.