Switched picker, added spec test