Tweaked tests and fixed pluck bug