More work on the list tests (they're messy and hard)