Refactor listing droplets into separate method
Simplify test
Improve droplet tests