Test refactoring, shorten run time of List row testing