Rerolled testing fix