Start exposing drop & take in public apis. Improve test coverage