Refactor test and allow pick with negative k