Fix test breakage from previous state fix