More testing modifications.