Added some more tests, fixed pick()