Fix existing list tests and implementation