Fix/pending more list tests