Improve take/drop test coverage