Made a couple of tests easier to read, by introducing helper functions.