Switched picker, added spec test
Switched picker, added spec test