Put all tests in the same package
Complete droplet tests
Move helpers to testhelpers