diff --git a/mpwo_api/mpwo_api/tests/test_activities_api_1_post.py b/mpwo_api/mpwo_api/tests/test_activities_api_1_post.py
index f97a869d..67198c18 100644
--- a/mpwo_api/mpwo_api/tests/test_activities_api_1_post.py
+++ b/mpwo_api/mpwo_api/tests/test_activities_api_1_post.py
@@ -41,7 +41,7 @@ def test_add_an_activity_gpx(app):
     assert 1 == data['data']['activities'][0]['user_id']
     assert 1 == data['data']['activities'][0]['sport_id']
     assert '0:04:10' == data['data']['activities'][0]['duration']
-    assert 'cycling - 2018-03-13 12:44:45' == data['data']['activities'][0]['title']  # noqa
+    assert 'just an activity' == data['data']['activities'][0]['title']
     assert data['data']['activities'][0]['ascent'] == 0.4
     assert data['data']['activities'][0]['ave_speed'] == 4.6
     assert data['data']['activities'][0]['descent'] == 23.4
@@ -99,7 +99,7 @@ def test_get_an_activity_with_gpx(app):
     assert 1 == data['data']['activities'][0]['user_id']
     assert 1 == data['data']['activities'][0]['sport_id']
     assert '0:04:10' == data['data']['activities'][0]['duration']
-    assert 'cycling - 2018-03-13 12:44:45' == data['data']['activities'][0]['title']  # noqa
+    assert 'just an activity' == data['data']['activities'][0]['title']
     assert data['data']['activities'][0]['ascent'] == 0.4
     assert data['data']['activities'][0]['ave_speed'] == 4.6
     assert data['data']['activities'][0]['descent'] == 23.4
diff --git a/mpwo_api/mpwo_api/tests/test_activities_api_2_patch.py b/mpwo_api/mpwo_api/tests/test_activities_api_2_patch.py
index d18f56fe..3e0be5b5 100644
--- a/mpwo_api/mpwo_api/tests/test_activities_api_2_patch.py
+++ b/mpwo_api/mpwo_api/tests/test_activities_api_2_patch.py
@@ -122,7 +122,7 @@ def test_edit_an_activity_with_gpx_partial(app):
     assert 1 == data['data']['activities'][0]['user_id']
     assert 2 == data['data']['activities'][0]['sport_id']
     assert '0:04:10' == data['data']['activities'][0]['duration']
-    assert data['data']['activities'][0]['title'] == 'cycling - 2018-03-13 12:44:45'  # noqa
+    assert data['data']['activities'][0]['title'] == 'just an activity'
     assert data['data']['activities'][0]['ascent'] == 0.4
     assert data['data']['activities'][0]['ave_speed'] == 4.6
     assert data['data']['activities'][0]['descent'] == 23.4
diff --git a/mpwo_api/mpwo_api/tests/utils_gpx.py b/mpwo_api/mpwo_api/tests/utils_gpx.py
index 229db78a..0e75f3c2 100644
--- a/mpwo_api/mpwo_api/tests/utils_gpx.py
+++ b/mpwo_api/mpwo_api/tests/utils_gpx.py
@@ -1,4 +1,116 @@
 gpx_file = (
+    '<?xml version=\'1.0\' encoding=\'UTF-8\'?>'
+    '<gpx xmlns:gpxdata="http://www.cluetrust.com/XML/GPXDATA/1/0" xmlns:gpxtpx="http://www.garmin.com/xmlschemas/TrackPointExtension/v1" xmlns:gpxext="http://www.garmin.com/xmlschemas/GpxExtensions/v3" xmlns="http://www.topografix.com/GPX/1/1">'  # noqa
+    '  <metadata/>'
+    '  <trk>'
+    '    <name>just an activity</name>'
+    '    <trkseg>'
+    '      <trkpt lat="44.68095" lon="6.07367">'
+    '        <ele>998</ele>'
+    '        <time>2018-03-13T12:44:45Z</time>'
+    '      </trkpt>'
+    '      <trkpt lat="44.68091" lon="6.07367">'
+    '        <ele>998</ele>'
+    '        <time>2018-03-13T12:44:50Z</time>'
+    '      </trkpt>'
+    '      <trkpt lat="44.6808" lon="6.07364">'
+    '        <ele>994</ele>'
+    '        <time>2018-03-13T12:45:00Z</time>'
+    '      </trkpt>'
+    '      <trkpt lat="44.68075" lon="6.07364">'
+    '        <ele>994</ele>'
+    '        <time>2018-03-13T12:45:05Z</time>'
+    '      </trkpt>'
+    '      <trkpt lat="44.68071" lon="6.07364">'
+    '        <ele>994</ele>'
+    '        <time>2018-03-13T12:45:10Z</time>'
+    '      </trkpt>'
+    '      <trkpt lat="44.68049" lon="6.07361">'
+    '        <ele>993</ele>'
+    '        <time>2018-03-13T12:45:30Z</time>'
+    '      </trkpt>'
+    '      <trkpt lat="44.68019" lon="6.07356">'
+    '        <ele>992</ele>'
+    '        <time>2018-03-13T12:45:55Z</time>'
+    '      </trkpt>'
+    '      <trkpt lat="44.68014" lon="6.07355">'
+    '        <ele>992</ele>'
+    '        <time>2018-03-13T12:46:00Z</time>'
+    '      </trkpt>'
+    '      <trkpt lat="44.67995" lon="6.07358">'
+    '        <ele>987</ele>'
+    '        <time>2018-03-13T12:46:15Z</time>'
+    '      </trkpt>'
+    '      <trkpt lat="44.67977" lon="6.07364">'
+    '        <ele>987</ele>'
+    '        <time>2018-03-13T12:46:30Z</time>'
+    '      </trkpt>'
+    '      <trkpt lat="44.67972" lon="6.07367">'
+    '        <ele>987</ele>'
+    '        <time>2018-03-13T12:46:35Z</time>'
+    '      </trkpt>'
+    '      <trkpt lat="44.67966" lon="6.07368">'
+    '        <ele>987</ele>'
+    '        <time>2018-03-13T12:46:40Z</time>'
+    '      </trkpt>'
+    '      <trkpt lat="44.67961" lon="6.0737">'
+    '        <ele>986</ele>'
+    '        <time>2018-03-13T12:46:45Z</time>'
+    '      </trkpt>'
+    '      <trkpt lat="44.67938" lon="6.07377">'
+    '        <ele>986</ele>'
+    '        <time>2018-03-13T12:47:05Z</time>'
+    '      </trkpt>'
+    '      <trkpt lat="44.67933" lon="6.07381">'
+    '        <ele>986</ele>'
+    '        <time>2018-03-13T12:47:10Z</time>'
+    '      </trkpt>'
+    '      <trkpt lat="44.67922" lon="6.07385">'
+    '        <ele>985</ele>'
+    '        <time>2018-03-13T12:47:20Z</time>'
+    '      </trkpt>'
+    '      <trkpt lat="44.67911" lon="6.0739">'
+    '        <ele>980</ele>'
+    '        <time>2018-03-13T12:47:30Z</time>'
+    '      </trkpt>'
+    '      <trkpt lat="44.679" lon="6.07399">'
+    '        <ele>980</ele>'
+    '        <time>2018-03-13T12:47:40Z</time>'
+    '      </trkpt>'
+    '      <trkpt lat="44.67896" lon="6.07402">'
+    '        <ele>980</ele>'
+    '        <time>2018-03-13T12:47:45Z</time>'
+    '      </trkpt>'
+    '      <trkpt lat="44.67884" lon="6.07408">'
+    '        <ele>979</ele>'
+    '        <time>2018-03-13T12:47:55Z</time>'
+    '      </trkpt>'
+    '      <trkpt lat="44.67863" lon="6.07423">'
+    '        <ele>981</ele>'
+    '        <time>2018-03-13T12:48:15Z</time>'
+    '      </trkpt>'
+    '      <trkpt lat="44.67858" lon="6.07425">'
+    '        <ele>980</ele>'
+    '        <time>2018-03-13T12:48:20Z</time>'
+    '      </trkpt>'
+    '      <trkpt lat="44.67842" lon="6.07434">'
+    '        <ele>979</ele>'
+    '        <time>2018-03-13T12:48:35Z</time>'
+    '      </trkpt>'
+    '      <trkpt lat="44.67837" lon="6.07435">'
+    '        <ele>979</ele>'
+    '        <time>2018-03-13T12:48:40Z</time>'
+    '      </trkpt>'
+    '      <trkpt lat="44.67822" lon="6.07442">'
+    '        <ele>975</ele>'
+    '        <time>2018-03-13T12:48:55Z</time>'
+    '      </trkpt>'
+    '    </trkseg>'
+    '  </trk>'
+    '</gpx>'
+)
+
+gpx_file_wo_name = (
     '<?xml version=\'1.0\' encoding=\'UTF-8\'?>'
     '<gpx xmlns:gpxdata="http://www.cluetrust.com/XML/GPXDATA/1/0" xmlns:gpxtpx="http://www.garmin.com/xmlschemas/TrackPointExtension/v1" xmlns:gpxext="http://www.garmin.com/xmlschemas/GpxExtensions/v3" xmlns="http://www.topografix.com/GPX/1/1">'  # noqa
     '  <metadata/>'
@@ -108,3 +220,12 @@ gpx_file = (
     '  </trk>'
     '</gpx>'
 )
+
+gpx_file_wo_track = (
+    '<?xml version=\'1.0\' encoding=\'UTF-8\'?>'
+    '<gpx xmlns:gpxdata="http://www.cluetrust.com/XML/GPXDATA/1/0" xmlns:gpxtpx="http://www.garmin.com/xmlschemas/TrackPointExtension/v1" xmlns:gpxext="http://www.garmin.com/xmlschemas/GpxExtensions/v3" xmlns="http://www.topografix.com/GPX/1/1">'  # noqa
+    '  <metadata/>'
+    '</gpx>'
+)
+
+gpx_file_empty = ''