list loader fix + tests