[WIP] Fix listing tests