fixed gps bugs
merged the gps test stuff