@andymckay @wraithan it's hard to reduce the length of those tests because we're testing a process (note the original test without etags is already 15 lines long). I can remove some lines but it'll make it less explicit.