Service Integration tests, refactorings, new GPX Files