That is much nicer - I will update the new tests to use that strategy instead.