Expand pluck/without to model
Add tests for pluck and without