Properly factor out ugly hack for another test