Completed refactoring for all current LIST tests