Fix specs, and add a test for empty picks