PR Changes
Generalize test