made GPS routines more testable