Not necessarily for this PR, but this is a candidate for a helper method (in the fixture or eventually in the gateway)