Avoid empty lists in more tests