Fix tests
Move parameter pass-through to pick clause