Updated lists + tests