diff --git a/tests/test-ls.c b/tests/test-ls.c
index 1488da6..34ec026 100644
--- a/tests/test-ls.c
+++ b/tests/test-ls.c
@@ -37,41 +37,13 @@
 #define LOCALDB "/.gtkpod/local_0.itdb"
 
 static void
-display_recently_played (Itdb_iTunesDB *db)
-{
-    Itdb_Playlist *mpl = itdb_playlist_mpl (db);
-    GList *it;
-
-    g_print ("Recently played:\n");
-    for (it = mpl->members; it != NULL; it = it->next) {
-        Itdb_Track *track = (Itdb_Track*)it->data;
-
-        if (track->recent_playcount != 0) {
-            char date[30];
-            time_t track_time = itdb_time_mac_to_host (track->time_played);
-
-            g_print ("%s - %s - %s:\n",
-                     track->artist, track->album, track->title);
-            strftime (date, sizeof (date), "%F %H:%M:%S",
-                      gmtime (&track_time));
-            g_print ("\tUTC: %s\n", date);
-            strftime (date, sizeof (date), "%F %H:%M:%S",
-                      localtime (&track_time));
-            g_print ("\tlocal: %s\n", date);
-            g_print ("track: %ld ", track_time);
-            time (&track_time);
-            g_print ("current: %ld\n", track_time);
-            g_print ("\n");
-        }
-    }
-}
-
-static void
 display_track (Itdb_Track *track, const char *prefix) 
 {
-    g_print ("%s%s - %s - %s\n", prefix,  
-	     track->artist, track->album, track->title);
-    g_print ("%s\t%s\n", prefix, track->ipod_path);
+    g_print ("%sArtist: %s\n", prefix, track->artist);
+    g_print ("%sAlbum:  %s\n", prefix, track->album);
+    g_print ("%sTitle:  %s\n", prefix, track->title);
+    g_print ("%sdbid:   0x%016x\n", prefix, track->dbid);
+    g_print ("%sid:     0x%08x\n\n", prefix, track->id);
 }
 
 static void
@@ -141,28 +113,7 @@ main (int argc, char *argv[])
 
   if (itdb)
   {
-      GList *it;
-
-      printf ("playlists: %d\n", g_list_length (itdb->playlists));
-      for (it = itdb->playlists; it != NULL; it = it->next) {
-	  Itdb_Playlist *playlist;
-
-	  playlist = (Itdb_Playlist *)it->data;
-	  
-	  if (playlistname == NULL || strcmp(playlist->name, playlistname) == 0) 
-	    display_playlist (playlist, "");
-      }
-
-      if (error)
-      {
-	  if (error->message) {
-	      g_print ("%s\n", error->message);
-	  }
-	  g_error_free (error);
-	  error = NULL;
-      }
-
-      display_recently_played (itdb);
+      display_playlist (itdb_playlist_mpl (itdb), "");
   }
 
   itdb_free (itdb);