fix tests + add test for choosing list