refactoring gps service adding tests, code is not currently working