Added drop zones
Added unit tests for drop zones