Upgrade pluck, and add a test that proves that it fixes stuff.

The test is kind of flaky so I should fix it at some point.