Fix for Playlists + tests tweaks