attempt at improving pick tests