consolidate gps VS naming in Test GSN