retrieve() now returns a collection

* reformatted code
* removed unneeded method argument
synced test to new changed Drop methods