There is obvious comminality between the two new tests here, would you mind factoring it out into a helper?