diff --git a/tests/mpd/audio_output_test.py b/tests/mpd/audio_output_test.py
new file mode 100644
index 00000000..6e6ea5b5
--- /dev/null
+++ b/tests/mpd/audio_output_test.py
@@ -0,0 +1,26 @@
+import unittest
+
+from mopidy.backends.dummy import DummyBackend
+from mopidy.mixers.dummy import DummyMixer
+from mopidy.mpd import frontend
+
+class AudioOutputHandlerTest(unittest.TestCase):
+    def setUp(self):
+        self.m = DummyMixer()
+        self.b = DummyBackend(mixer=self.m)
+        self.h = frontend.MpdFrontend(backend=self.b)
+
+    def test_enableoutput(self):
+        result = self.h.handle_request(u'enableoutput "0"')
+        self.assert_(u'ACK [0@0] {} Not implemented' in result)
+
+    def test_disableoutput(self):
+        result = self.h.handle_request(u'disableoutput "0"')
+        self.assert_(u'ACK [0@0] {} Not implemented' in result)
+
+    def test_outputs(self):
+        result = self.h.handle_request(u'outputs')
+        self.assert_(u'outputid: 0' in result)
+        self.assert_(u'outputname: DummyBackend' in result)
+        self.assert_(u'outputenabled: 1' in result)
+        self.assert_(u'OK' in result)
diff --git a/tests/mpd/command_list_test.py b/tests/mpd/command_list_test.py
new file mode 100644
index 00000000..69eb19ac
--- /dev/null
+++ b/tests/mpd/command_list_test.py
@@ -0,0 +1,58 @@
+import unittest
+
+from mopidy.backends.dummy import DummyBackend
+from mopidy.mixers.dummy import DummyMixer
+from mopidy.mpd import frontend
+
+class CommandListsTest(unittest.TestCase):
+    def setUp(self):
+        self.m = DummyMixer()
+        self.b = DummyBackend(mixer=self.m)
+        self.h = frontend.MpdFrontend(backend=self.b)
+
+    def test_command_list_begin(self):
+        result = self.h.handle_request(u'command_list_begin')
+        self.assert_(result is None)
+
+    def test_command_list_end(self):
+        self.h.handle_request(u'command_list_begin')
+        result = self.h.handle_request(u'command_list_end')
+        self.assert_(u'OK' in result)
+
+    def test_command_list_end_without_start_first_is_an_unknown_command(self):
+        result = self.h.handle_request(u'command_list_end')
+        self.assertEquals(result[0],
+            u'ACK [5@0] {} unknown command "command_list_end"')
+
+    def test_command_list_with_ping(self):
+        self.h.handle_request(u'command_list_begin')
+        self.assertEqual([], self.h.command_list)
+        self.assertEqual(False, self.h.command_list_ok)
+        self.h.handle_request(u'ping')
+        self.assert_(u'ping' in self.h.command_list)
+        result = self.h.handle_request(u'command_list_end')
+        self.assert_(u'OK' in result)
+        self.assertEqual(False, self.h.command_list)
+
+    def test_command_list_with_error_returns_ack_with_correct_index(self):
+        self.h.handle_request(u'command_list_begin')
+        self.h.handle_request(u'play') # Known command
+        self.h.handle_request(u'paly') # Unknown command
+        result = self.h.handle_request(u'command_list_end')
+        self.assertEqual(result[0], u'ACK [5@1] {} unknown command "paly"')
+
+    def test_command_list_ok_begin(self):
+        result = self.h.handle_request(u'command_list_ok_begin')
+        self.assert_(result is None)
+
+    def test_command_list_ok_with_ping(self):
+        self.h.handle_request(u'command_list_ok_begin')
+        self.assertEqual([], self.h.command_list)
+        self.assertEqual(True, self.h.command_list_ok)
+        self.h.handle_request(u'ping')
+        self.assert_(u'ping' in self.h.command_list)
+        result = self.h.handle_request(u'command_list_end')
+        self.assert_(u'list_OK' in result)
+        self.assert_(u'OK' in result)
+        self.assertEqual(False, self.h.command_list)
+        self.assertEqual(False, self.h.command_list_ok)
diff --git a/tests/mpd/connection_test.py b/tests/mpd/connection_test.py
new file mode 100644
index 00000000..82c7d5c8
--- /dev/null
+++ b/tests/mpd/connection_test.py
@@ -0,0 +1,31 @@
+import unittest
+
+from mopidy.backends.dummy import DummyBackend
+from mopidy.mixers.dummy import DummyMixer
+from mopidy.mpd import frontend
+
+class ConnectionHandlerTest(unittest.TestCase):
+    def setUp(self):
+        self.m = DummyMixer()
+        self.b = DummyBackend(mixer=self.m)
+        self.h = frontend.MpdFrontend(backend=self.b)
+
+    def test_close(self):
+        result = self.h.handle_request(u'close')
+        self.assert_(u'OK' in result)
+
+    def test_empty_request(self):
+        result = self.h.handle_request(u'')
+        self.assert_(u'OK' in result)
+
+    def test_kill(self):
+        result = self.h.handle_request(u'kill')
+        self.assert_(u'OK' in result)
+
+    def test_password(self):
+        result = self.h.handle_request(u'password "secret"')
+        self.assert_(u'ACK [0@0] {} Not implemented' in result)
+
+    def test_ping(self):
+        result = self.h.handle_request(u'ping')
+        self.assert_(u'OK' in result)
diff --git a/tests/mpd/current_playlist_test.py b/tests/mpd/current_playlist_test.py
new file mode 100644
index 00000000..09e61b63
--- /dev/null
+++ b/tests/mpd/current_playlist_test.py
@@ -0,0 +1,393 @@
+import unittest
+
+from mopidy.backends.dummy import DummyBackend
+from mopidy.mixers.dummy import DummyMixer
+from mopidy.models import Track
+from mopidy.mpd import frontend
+
+class CurrentPlaylistHandlerTest(unittest.TestCase):
+    def setUp(self):
+        self.m = DummyMixer()
+        self.b = DummyBackend(mixer=self.m)
+        self.h = frontend.MpdFrontend(backend=self.b)
+
+    def test_add(self):
+        needle = Track(uri='dummy://foo')
+        self.b.library._library = [Track(), Track(), needle, Track()]
+        self.b.current_playlist.load(
+            [Track(), Track(), Track(), Track(), Track()])
+        self.assertEqual(len(self.b.current_playlist.tracks), 5)
+        result = self.h.handle_request(u'add "dummy://foo"')
+        self.assertEqual(len(self.b.current_playlist.tracks), 6)
+        self.assertEqual(self.b.current_playlist.tracks[5], needle)
+        self.assertEqual(len(result), 1)
+        self.assert_(u'OK' in result)
+
+    def test_add_with_uri_not_found_in_library_should_ack(self):
+        result = self.h.handle_request(u'add "dummy://foo"')
+        self.assertEqual(result[0],
+            u'ACK [50@0] {add} directory or file not found')
+
+    def test_addid_without_songpos(self):
+        needle = Track(uri='dummy://foo', id=137)
+        self.b.library._library = [Track(), Track(), needle, Track()]
+        self.b.current_playlist.load(
+            [Track(), Track(), Track(), Track(), Track()])
+        self.assertEqual(len(self.b.current_playlist.tracks), 5)
+        result = self.h.handle_request(u'addid "dummy://foo"')
+        self.assertEqual(len(self.b.current_playlist.tracks), 6)
+        self.assertEqual(self.b.current_playlist.tracks[5], needle)
+        self.assert_(u'Id: 137' in result)
+        self.assert_(u'OK' in result)
+
+    def test_addid_with_songpos(self):
+        needle = Track(uri='dummy://foo', id=137)
+        self.b.library._library = [Track(), Track(), needle, Track()]
+        self.b.current_playlist.load(
+            [Track(), Track(), Track(), Track(), Track()])
+        self.assertEqual(len(self.b.current_playlist.tracks), 5)
+        result = self.h.handle_request(u'addid "dummy://foo" "3"')
+        self.assertEqual(len(self.b.current_playlist.tracks), 6)
+        self.assertEqual(self.b.current_playlist.tracks[3], needle)
+        self.assert_(u'Id: 137' in result)
+        self.assert_(u'OK' in result)
+
+    def test_addid_with_songpos_out_of_bounds_should_ack(self):
+        needle = Track(uri='dummy://foo', id=137)
+        self.b.library._library = [Track(), Track(), needle, Track()]
+        self.b.current_playlist.load(
+            [Track(), Track(), Track(), Track(), Track()])
+        self.assertEqual(len(self.b.current_playlist.tracks), 5)
+        result = self.h.handle_request(u'addid "dummy://foo" "6"')
+        self.assertEqual(result[0], u'ACK [2@0] {addid} Bad song index')
+
+    def test_addid_with_uri_not_found_in_library_should_ack(self):
+        result = self.h.handle_request(u'addid "dummy://foo"')
+        self.assertEqual(result[0], u'ACK [50@0] {addid} No such song')
+
+    def test_clear(self):
+        self.b.current_playlist.load(
+            [Track(), Track(), Track(), Track(), Track()])
+        self.assertEqual(len(self.b.current_playlist.tracks), 5)
+        result = self.h.handle_request(u'clear')
+        self.assertEqual(len(self.b.current_playlist.tracks), 0)
+        self.assertEqual(self.b.playback.current_track, None)
+        self.assert_(u'OK' in result)
+
+    def test_delete_songpos(self):
+        self.b.current_playlist.load(
+            [Track(id=1), Track(id=2), Track(id=3), Track(id=4), Track(id=5)])
+        self.assertEqual(len(self.b.current_playlist.tracks), 5)
+        result = self.h.handle_request(u'delete "2"')
+        self.assertEqual(len(self.b.current_playlist.tracks), 4)
+        self.assert_(u'OK' in result)
+
+    def test_delete_songpos_out_of_bounds(self):
+        self.b.current_playlist.load(
+            [Track(), Track(), Track(), Track(), Track()])
+        self.assertEqual(len(self.b.current_playlist.tracks), 5)
+        result = self.h.handle_request(u'delete "5"')
+        self.assertEqual(len(self.b.current_playlist.tracks), 5)
+        self.assertEqual(result[0], u'ACK [2@0] {delete} Bad song index')
+
+    def test_delete_open_range(self):
+        self.b.current_playlist.load(
+            [Track(id=1), Track(id=2), Track(id=3), Track(id=4), Track(id=5)])
+        self.assertEqual(len(self.b.current_playlist.tracks), 5)
+        result = self.h.handle_request(u'delete "1:"')
+        self.assertEqual(len(self.b.current_playlist.tracks), 1)
+        self.assert_(u'OK' in result)
+
+    def test_delete_closed_range(self):
+        self.b.current_playlist.load(
+            [Track(id=1), Track(id=2), Track(id=3), Track(id=4), Track(id=5)])
+        self.assertEqual(len(self.b.current_playlist.tracks), 5)
+        result = self.h.handle_request(u'delete "1:3"')
+        self.assertEqual(len(self.b.current_playlist.tracks), 3)
+        self.assert_(u'OK' in result)
+
+    def test_delete_range_out_of_bounds(self):
+        self.b.current_playlist.load(
+            [Track(), Track(), Track(), Track(), Track()])
+        self.assertEqual(len(self.b.current_playlist.tracks), 5)
+        result = self.h.handle_request(u'delete "5:7"')
+        self.assertEqual(len(self.b.current_playlist.tracks), 5)
+        self.assertEqual(result[0], u'ACK [2@0] {delete} Bad song index')
+
+    def test_deleteid(self):
+        self.b.current_playlist.load([Track(), Track()])
+        self.assertEqual(len(self.b.current_playlist.tracks), 2)
+        result = self.h.handle_request(u'deleteid "2"')
+        self.assertEqual(len(self.b.current_playlist.tracks), 1)
+        self.assert_(u'OK' in result)
+
+    def test_deleteid_does_not_exist(self):
+        self.b.current_playlist.load([Track(), Track()])
+        self.assertEqual(len(self.b.current_playlist.tracks), 2)
+        result = self.h.handle_request(u'deleteid "12345"')
+        self.assertEqual(len(self.b.current_playlist.tracks), 2)
+        self.assertEqual(result[0], u'ACK [50@0] {deleteid} No such song')
+
+    def test_move_songpos(self):
+        self.b.current_playlist.load([
+            Track(name='a'), Track(name='b'), Track(name='c'),
+            Track(name='d'), Track(name='e'), Track(name='f'),
+        ])
+        result = self.h.handle_request(u'move "1" "0"')
+        self.assertEqual(self.b.current_playlist.tracks[0].name, 'b')
+        self.assertEqual(self.b.current_playlist.tracks[1].name, 'a')
+        self.assertEqual(self.b.current_playlist.tracks[2].name, 'c')
+        self.assertEqual(self.b.current_playlist.tracks[3].name, 'd')
+        self.assertEqual(self.b.current_playlist.tracks[4].name, 'e')
+        self.assertEqual(self.b.current_playlist.tracks[5].name, 'f')
+        self.assert_(u'OK' in result)
+
+    def test_move_open_range(self):
+        self.b.current_playlist.load([
+            Track(name='a'), Track(name='b'), Track(name='c'),
+            Track(name='d'), Track(name='e'), Track(name='f'),
+        ])
+        result = self.h.handle_request(u'move "2:" "0"')
+        self.assertEqual(self.b.current_playlist.tracks[0].name, 'c')
+        self.assertEqual(self.b.current_playlist.tracks[1].name, 'd')
+        self.assertEqual(self.b.current_playlist.tracks[2].name, 'e')
+        self.assertEqual(self.b.current_playlist.tracks[3].name, 'f')
+        self.assertEqual(self.b.current_playlist.tracks[4].name, 'a')
+        self.assertEqual(self.b.current_playlist.tracks[5].name, 'b')
+        self.assert_(u'OK' in result)
+
+    def test_move_closed_range(self):
+        self.b.current_playlist.load([
+            Track(name='a'), Track(name='b'), Track(name='c'),
+            Track(name='d'), Track(name='e'), Track(name='f'),
+        ])
+        result = self.h.handle_request(u'move "1:3" "0"')
+        self.assertEqual(self.b.current_playlist.tracks[0].name, 'b')
+        self.assertEqual(self.b.current_playlist.tracks[1].name, 'c')
+        self.assertEqual(self.b.current_playlist.tracks[2].name, 'a')
+        self.assertEqual(self.b.current_playlist.tracks[3].name, 'd')
+        self.assertEqual(self.b.current_playlist.tracks[4].name, 'e')
+        self.assertEqual(self.b.current_playlist.tracks[5].name, 'f')
+        self.assert_(u'OK' in result)
+
+    def test_moveid(self):
+        self.b.current_playlist.load([
+            Track(name='a'), Track(name='b'), Track(name='c'),
+            Track(name='d'), Track(name='e'), Track(name='f'),
+        ])
+        result = self.h.handle_request(u'moveid "5" "2"')
+        self.assertEqual(self.b.current_playlist.tracks[0].name, 'a')
+        self.assertEqual(self.b.current_playlist.tracks[1].name, 'b')
+        self.assertEqual(self.b.current_playlist.tracks[2].name, 'e')
+        self.assertEqual(self.b.current_playlist.tracks[3].name, 'c')
+        self.assertEqual(self.b.current_playlist.tracks[4].name, 'd')
+        self.assertEqual(self.b.current_playlist.tracks[5].name, 'f')
+        self.assert_(u'OK' in result)
+
+    def test_playlist_returns_same_as_playlistinfo(self):
+        playlist_result = self.h.handle_request(u'playlist')
+        playlistinfo_result = self.h.handle_request(u'playlistinfo')
+        self.assertEqual(playlist_result, playlistinfo_result)
+
+    def test_playlistfind(self):
+        result = self.h.handle_request(u'playlistfind "tag" "needle"')
+        self.assert_(u'ACK [0@0] {} Not implemented' in result)
+
+    def test_playlistfind_by_filename(self):
+        result = self.h.handle_request(
+            u'playlistfind "filename" "file:///dev/null"')
+        self.assert_(u'OK' in result)
+
+    def test_playlistfind_by_filename_without_quotes(self):
+        result = self.h.handle_request(
+            u'playlistfind filename "file:///dev/null"')
+        self.assert_(u'OK' in result)
+
+    def test_playlistfind_by_filename_in_current_playlist(self):
+        self.b.current_playlist.load([
+            Track(uri='file:///exists')])
+        result = self.h.handle_request(
+            u'playlistfind filename "file:///exists"')
+        self.assert_(u'file: file:///exists' in result)
+        self.assert_(u'OK' in result)
+
+    def test_playlistid_without_songid(self):
+        self.b.current_playlist.load([Track(name='a'), Track(name='b')])
+        result = self.h.handle_request(u'playlistid')
+        self.assert_(u'Title: a' in result)
+        self.assert_(u'Title: b' in result)
+        self.assert_(u'OK' in result)
+
+    def test_playlistid_with_songid(self):
+        self.b.current_playlist.load([Track(name='a'), Track(name='b')])
+        result = self.h.handle_request(u'playlistid "2"')
+        self.assert_(u'Title: a' not in result)
+        self.assert_(u'Id: 1' not in result)
+        self.assert_(u'Title: b' in result)
+        self.assert_(u'Id: 2' in result)
+        self.assert_(u'OK' in result)
+
+    def test_playlistid_with_not_existing_songid_fails(self):
+        self.b.current_playlist.load([Track(name='a'), Track(name='b')])
+        result = self.h.handle_request(u'playlistid "25"')
+        self.assertEqual(result[0], u'ACK [50@0] {playlistid} No such song')
+
+    def test_playlistinfo_without_songpos_or_range(self):
+        self.b.current_playlist.load([
+            Track(name='a'), Track(name='b'), Track(name='c'),
+            Track(name='d'), Track(name='e'), Track(name='f'),
+        ])
+        result = self.h.handle_request(u'playlistinfo')
+        self.assert_(u'Title: a' in result)
+        self.assert_(u'Title: b' in result)
+        self.assert_(u'Title: c' in result)
+        self.assert_(u'Title: d' in result)
+        self.assert_(u'Title: e' in result)
+        self.assert_(u'Title: f' in result)
+        self.assert_(u'OK' in result)
+
+    def test_playlistinfo_with_songpos(self):
+        self.b.current_playlist.load([
+            Track(name='a'), Track(name='b'), Track(name='c'),
+            Track(name='d'), Track(name='e'), Track(name='f'),
+        ])
+        result = self.h.handle_request(u'playlistinfo "4"')
+        self.assert_(u'Title: a' not in result)
+        self.assert_(u'Title: b' not in result)
+        self.assert_(u'Title: c' not in result)
+        self.assert_(u'Title: d' not in result)
+        self.assert_(u'Title: e' in result)
+        self.assert_(u'Title: f' not in result)
+        self.assert_(u'OK' in result)
+
+    def test_playlistinfo_with_negative_songpos_same_as_playlistinfo(self):
+        result1 = self.h.handle_request(u'playlistinfo "-1"')
+        result2 = self.h.handle_request(u'playlistinfo')
+        self.assertEqual(result1, result2)
+
+    def test_playlistinfo_with_open_range(self):
+        self.b.current_playlist.load([
+            Track(name='a'), Track(name='b'), Track(name='c'),
+            Track(name='d'), Track(name='e'), Track(name='f'),
+        ])
+        result = self.h.handle_request(u'playlistinfo "2:"')
+        self.assert_(u'Title: a' not in result)
+        self.assert_(u'Title: b' not in result)
+        self.assert_(u'Title: c' in result)
+        self.assert_(u'Title: d' in result)
+        self.assert_(u'Title: e' in result)
+        self.assert_(u'Title: f' in result)
+        self.assert_(u'OK' in result)
+
+    def test_playlistinfo_with_closed_range(self):
+        self.b.current_playlist.load([
+            Track(name='a'), Track(name='b'), Track(name='c'),
+            Track(name='d'), Track(name='e'), Track(name='f'),
+        ])
+        result = self.h.handle_request(u'playlistinfo "2:4"')
+        self.assert_(u'Title: a' not in result)
+        self.assert_(u'Title: b' not in result)
+        self.assert_(u'Title: c' in result)
+        self.assert_(u'Title: d' in result)
+        self.assert_(u'Title: e' not in result)
+        self.assert_(u'Title: f' not in result)
+        self.assert_(u'OK' in result)
+
+    def test_playlistinfo_with_too_high_start_of_range_returns_arg_error(self):
+        result = self.h.handle_request(u'playlistinfo "10:20"')
+        self.assert_(u'ACK [2@0] {playlistinfo} Bad song index' in result)
+
+    def test_playlistinfo_with_too_high_end_of_range_returns_ok(self):
+        result = self.h.handle_request(u'playlistinfo "0:20"')
+        self.assert_(u'OK' in result)
+
+    def test_playlistsearch(self):
+        result = self.h.handle_request(u'playlistsearch "tag" "needle"')
+        self.assert_(u'ACK [0@0] {} Not implemented' in result)
+
+    def test_plchanges(self):
+        self.b.current_playlist.load(
+            [Track(name='a'), Track(name='b'), Track(name='c')])
+        result = self.h.handle_request(u'plchanges "0"')
+        self.assert_(u'Title: a' in result)
+        self.assert_(u'Title: b' in result)
+        self.assert_(u'Title: c' in result)
+        self.assert_(u'OK' in result)
+
+    def test_plchangesposid(self):
+        self.b.current_playlist.load(
+            [Track(id=11), Track(id=12), Track(id=13)])
+        result = self.h.handle_request(u'plchangesposid "0"')
+        self.assert_(u'cpos: 0' in result)
+        self.assert_(u'Id: 11' in result)
+        self.assert_(u'cpos: 2' in result)
+        self.assert_(u'Id: 12' in result)
+        self.assert_(u'cpos: 2' in result)
+        self.assert_(u'Id: 13' in result)
+        self.assert_(u'OK' in result)
+
+    def test_shuffle_without_range(self):
+        self.b.current_playlist.load([
+            Track(name='a'), Track(name='b'), Track(name='c'),
+            Track(name='d'), Track(name='e'), Track(name='f'),
+        ])
+        version = self.b.current_playlist.version
+        result = self.h.handle_request(u'shuffle')
+        self.assert_(version < self.b.current_playlist.version)
+        self.assert_(u'OK' in result)
+
+    def test_shuffle_with_open_range(self):
+        self.b.current_playlist.load([
+            Track(name='a'), Track(name='b'), Track(name='c'),
+            Track(name='d'), Track(name='e'), Track(name='f'),
+        ])
+        version = self.b.current_playlist.version
+        result = self.h.handle_request(u'shuffle "4:"')
+        self.assert_(version < self.b.current_playlist.version)
+        self.assertEqual(self.b.current_playlist.tracks[0].name, 'a')
+        self.assertEqual(self.b.current_playlist.tracks[1].name, 'b')
+        self.assertEqual(self.b.current_playlist.tracks[2].name, 'c')
+        self.assertEqual(self.b.current_playlist.tracks[3].name, 'd')
+        self.assert_(u'OK' in result)
+
+    def test_shuffle_with_closed_range(self):
+        self.b.current_playlist.load([
+            Track(name='a'), Track(name='b'), Track(name='c'),
+            Track(name='d'), Track(name='e'), Track(name='f'),
+        ])
+        version = self.b.current_playlist.version
+        result = self.h.handle_request(u'shuffle "1:3"')
+        self.assert_(version < self.b.current_playlist.version)
+        self.assertEqual(self.b.current_playlist.tracks[0].name, 'a')
+        self.assertEqual(self.b.current_playlist.tracks[3].name, 'd')
+        self.assertEqual(self.b.current_playlist.tracks[4].name, 'e')
+        self.assertEqual(self.b.current_playlist.tracks[5].name, 'f')
+        self.assert_(u'OK' in result)
+
+    def test_swap(self):
+        self.b.current_playlist.load([
+            Track(name='a'), Track(name='b'), Track(name='c'),
+            Track(name='d'), Track(name='e'), Track(name='f'),
+        ])
+        result = self.h.handle_request(u'swap "1" "4"')
+        self.assertEqual(self.b.current_playlist.tracks[0].name, 'a')
+        self.assertEqual(self.b.current_playlist.tracks[1].name, 'e')
+        self.assertEqual(self.b.current_playlist.tracks[2].name, 'c')
+        self.assertEqual(self.b.current_playlist.tracks[3].name, 'd')
+        self.assertEqual(self.b.current_playlist.tracks[4].name, 'b')
+        self.assertEqual(self.b.current_playlist.tracks[5].name, 'f')
+        self.assert_(u'OK' in result)
+
+    def test_swapid(self):
+        self.b.current_playlist.load([
+            Track(name='a'), Track(name='b'), Track(name='c'),
+            Track(name='d'), Track(name='e'), Track(name='f'),
+        ])
+        result = self.h.handle_request(u'swapid "2" "5"')
+        self.assertEqual(self.b.current_playlist.tracks[0].name, 'a')
+        self.assertEqual(self.b.current_playlist.tracks[1].name, 'e')
+        self.assertEqual(self.b.current_playlist.tracks[2].name, 'c')
+        self.assertEqual(self.b.current_playlist.tracks[3].name, 'd')
+        self.assertEqual(self.b.current_playlist.tracks[4].name, 'b')
+        self.assertEqual(self.b.current_playlist.tracks[5].name, 'f')
+        self.assert_(u'OK' in result)
diff --git a/tests/mpd/frontend_test.py b/tests/mpd/frontend_test.py
deleted file mode 100644
index 1e92d715..00000000
--- a/tests/mpd/frontend_test.py
+++ /dev/null
@@ -1,1274 +0,0 @@
-import datetime as dt
-import unittest
-
-from mopidy.backends.dummy import DummyBackend
-from mopidy.mixers.dummy import DummyMixer
-from mopidy.models import Track, Playlist
-from mopidy.mpd import frontend, MpdAckError
-
-from tests import SkipTest
-
-class RequestHandlerTest(unittest.TestCase):
-    def setUp(self):
-        self.m = DummyMixer()
-        self.b = DummyBackend(mixer=self.m)
-        self.h = frontend.MpdFrontend(backend=self.b)
-
-    def test_register_same_pattern_twice_fails(self):
-        func = lambda: None
-        try:
-            frontend.handle_pattern('a pattern')(func)
-            frontend.handle_pattern('a pattern')(func)
-            self.fail('Registering a pattern twice shoulde raise ValueError')
-        except ValueError:
-            pass
-
-    def test_finding_handler_for_unknown_command_raises_exception(self):
-        try:
-            self.h.find_handler('an_unknown_command with args')
-            fail('Should raise exception')
-        except MpdAckError as e:
-            self.assertEqual(e.get_mpd_ack(),
-                u'ACK [5@0] {} unknown command "an_unknown_command"')
-
-    def test_finding_handler_for_known_command_returns_handler_and_kwargs(self):
-        expected_handler = lambda x: None
-        frontend._request_handlers['known_command (?P<arg1>.+)'] = \
-            expected_handler
-        (handler, kwargs) = self.h.find_handler('known_command an_arg')
-        self.assertEqual(handler, expected_handler)
-        self.assert_('arg1' in kwargs)
-        self.assertEqual(kwargs['arg1'], 'an_arg')
-
-    def test_handling_unknown_request_yields_error(self):
-        result = self.h.handle_request('an unhandled request')
-        self.assertEqual(result[0], u'ACK [5@0] {} unknown command "an"')
-
-    def test_handling_known_request(self):
-        expected = 'magic'
-        frontend._request_handlers['known request'] = lambda x: expected
-        result = self.h.handle_request('known request')
-        self.assert_(u'OK' in result)
-        self.assert_(expected in result)
-
-
-class CommandListsTest(unittest.TestCase):
-    def setUp(self):
-        self.m = DummyMixer()
-        self.b = DummyBackend(mixer=self.m)
-        self.h = frontend.MpdFrontend(backend=self.b)
-
-    def test_command_list_begin(self):
-        result = self.h.handle_request(u'command_list_begin')
-        self.assert_(result is None)
-
-    def test_command_list_end(self):
-        self.h.handle_request(u'command_list_begin')
-        result = self.h.handle_request(u'command_list_end')
-        self.assert_(u'OK' in result)
-
-    def test_command_list_end_without_start_first_is_an_unknown_command(self):
-        result = self.h.handle_request(u'command_list_end')
-        self.assertEquals(result[0],
-            u'ACK [5@0] {} unknown command "command_list_end"')
-
-    def test_command_list_with_ping(self):
-        self.h.handle_request(u'command_list_begin')
-        self.assertEqual([], self.h.command_list)
-        self.assertEqual(False, self.h.command_list_ok)
-        self.h.handle_request(u'ping')
-        self.assert_(u'ping' in self.h.command_list)
-        result = self.h.handle_request(u'command_list_end')
-        self.assert_(u'OK' in result)
-        self.assertEqual(False, self.h.command_list)
-
-    def test_command_list_with_error_returns_ack_with_correct_index(self):
-        self.h.handle_request(u'command_list_begin')
-        self.h.handle_request(u'play') # Known command
-        self.h.handle_request(u'paly') # Unknown command
-        result = self.h.handle_request(u'command_list_end')
-        self.assertEqual(result[0], u'ACK [5@1] {} unknown command "paly"')
-
-    def test_command_list_ok_begin(self):
-        result = self.h.handle_request(u'command_list_ok_begin')
-        self.assert_(result is None)
-
-    def test_command_list_ok_with_ping(self):
-        self.h.handle_request(u'command_list_ok_begin')
-        self.assertEqual([], self.h.command_list)
-        self.assertEqual(True, self.h.command_list_ok)
-        self.h.handle_request(u'ping')
-        self.assert_(u'ping' in self.h.command_list)
-        result = self.h.handle_request(u'command_list_end')
-        self.assert_(u'list_OK' in result)
-        self.assert_(u'OK' in result)
-        self.assertEqual(False, self.h.command_list)
-        self.assertEqual(False, self.h.command_list_ok)
-
-
-class StatusHandlerTest(unittest.TestCase):
-    def setUp(self):
-        self.m = DummyMixer()
-        self.b = DummyBackend(mixer=self.m)
-        self.h = frontend.MpdFrontend(backend=self.b)
-
-    def test_clearerror(self):
-        result = self.h.handle_request(u'clearerror')
-        self.assert_(u'ACK [0@0] {} Not implemented' in result)
-
-    def test_currentsong(self):
-        track = Track()
-        self.b.current_playlist.load([track])
-        self.b.playback.play()
-        result = self.h.handle_request(u'currentsong')
-        self.assert_(u'file: ' in result)
-        self.assert_(u'Time: 0' in result)
-        self.assert_(u'Artist: ' in result)
-        self.assert_(u'Title: ' in result)
-        self.assert_(u'Album: ' in result)
-        self.assert_(u'Track: 0' in result)
-        self.assert_(u'Date: ' in result)
-        self.assert_(u'Pos: 0' in result)
-        self.assert_(u'Id: 1' in result)
-        self.assert_(u'OK' in result)
-
-    def test_currentsong_without_song(self):
-        result = self.h.handle_request(u'currentsong')
-        self.assert_(u'OK' in result)
-
-    def test_idle_without_subsystems(self):
-        result = self.h.handle_request(u'idle')
-        self.assert_(u'OK' in result)
-
-    def test_idle_with_subsystems(self):
-        result = self.h.handle_request(u'idle database playlist')
-        self.assert_(u'OK' in result)
-
-    def test_noidle(self):
-        result = self.h.handle_request(u'noidle')
-        self.assert_(u'OK' in result)
-
-    def test_stats_command(self):
-        result = self.h.handle_request(u'stats')
-        self.assert_(u'OK' in result)
-
-    def test_stats_method(self):
-        result = self.h._status_stats()
-        self.assert_('artists' in result)
-        self.assert_(int(result['artists']) >= 0)
-        self.assert_('albums' in result)
-        self.assert_(int(result['albums']) >= 0)
-        self.assert_('songs' in result)
-        self.assert_(int(result['songs']) >= 0)
-        self.assert_('uptime' in result)
-        self.assert_(int(result['uptime']) >= 0)
-        self.assert_('db_playtime' in result)
-        self.assert_(int(result['db_playtime']) >= 0)
-        self.assert_('db_update' in result)
-        self.assert_(int(result['db_update']) >= 0)
-        self.assert_('playtime' in result)
-        self.assert_(int(result['playtime']) >= 0)
-
-    def test_status_command(self):
-        result = self.h.handle_request(u'status')
-        self.assert_(u'OK' in result)
-
-    def test_status_method_contains_volume_which_defaults_to_0(self):
-        result = dict(self.h._status_status())
-        self.assert_('volume' in result)
-        self.assertEqual(int(result['volume']), 0)
-
-    def test_status_method_contains_volume(self):
-        self.b.mixer.volume = 17
-        result = dict(self.h._status_status())
-        self.assert_('volume' in result)
-        self.assertEqual(int(result['volume']), 17)
-
-    def test_status_method_contains_repeat_is_0(self):
-        result = dict(self.h._status_status())
-        self.assert_('repeat' in result)
-        self.assertEqual(int(result['repeat']), 0)
-
-    def test_status_method_contains_repeat_is_1(self):
-        self.b.playback.repeat = 1
-        result = dict(self.h._status_status())
-        self.assert_('repeat' in result)
-        self.assertEqual(int(result['repeat']), 1)
-
-    def test_status_method_contains_random_is_0(self):
-        result = dict(self.h._status_status())
-        self.assert_('random' in result)
-        self.assertEqual(int(result['random']), 0)
-
-    def test_status_method_contains_random_is_1(self):
-        self.b.playback.random = 1
-        result = dict(self.h._status_status())
-        self.assert_('random' in result)
-        self.assertEqual(int(result['random']), 1)
-
-    def test_status_method_contains_single(self):
-        result = dict(self.h._status_status())
-        self.assert_('single' in result)
-        self.assert_(int(result['single']) in (0, 1))
-
-    def test_status_method_contains_consume_is_0(self):
-        result = dict(self.h._status_status())
-        self.assert_('consume' in result)
-        self.assertEqual(int(result['consume']), 0)
-
-    def test_status_method_contains_consume_is_1(self):
-        self.b.playback.consume = 1
-        result = dict(self.h._status_status())
-        self.assert_('consume' in result)
-        self.assertEqual(int(result['consume']), 1)
-
-    def test_status_method_contains_playlist(self):
-        result = dict(self.h._status_status())
-        self.assert_('playlist' in result)
-        self.assert_(int(result['playlist']) in xrange(0, 2**31 - 1))
-
-    def test_status_method_contains_playlistlength(self):
-        result = dict(self.h._status_status())
-        self.assert_('playlistlength' in result)
-        self.assert_(int(result['playlistlength']) >= 0)
-
-    def test_status_method_contains_xfade(self):
-        result = dict(self.h._status_status())
-        self.assert_('xfade' in result)
-        self.assert_(int(result['xfade']) >= 0)
-
-    def test_status_method_contains_state_is_play(self):
-        self.b.playback.state = self.b.playback.PLAYING
-        result = dict(self.h._status_status())
-        self.assert_('state' in result)
-        self.assertEqual(result['state'], 'play')
-
-    def test_status_method_contains_state_is_stop(self):
-        self.b.playback.state = self.b.playback.STOPPED
-        result = dict(self.h._status_status())
-        self.assert_('state' in result)
-        self.assertEqual(result['state'], 'stop')
-
-    def test_status_method_contains_state_is_pause(self):
-        self.b.playback.state = self.b.playback.PLAYING
-        self.b.playback.state = self.b.playback.PAUSED
-        result = dict(self.h._status_status())
-        self.assert_('state' in result)
-        self.assertEqual(result['state'], 'pause')
-
-    def test_status_method_when_playlist_loaded_contains_song(self):
-        self.b.current_playlist.load([Track()])
-        self.b.playback.play()
-        result = dict(self.h._status_status())
-        self.assert_('song' in result)
-        self.assert_(int(result['song']) >= 0)
-
-    def test_status_method_when_playlist_loaded_contains_cpid_as_songid(self):
-        self.b.current_playlist.load([Track()])
-        self.b.playback.play()
-        result = dict(self.h._status_status())
-        self.assert_('songid' in result)
-        self.assertEqual(int(result['songid']), 1)
-
-    def test_status_method_when_playing_contains_time_with_no_length(self):
-        self.b.current_playlist.load([Track(length=None)])
-        self.b.playback.play()
-        result = dict(self.h._status_status())
-        self.assert_('time' in result)
-        (position, total) = result['time'].split(':')
-        position = int(position)
-        total = int(total)
-        self.assert_(position <= total)
-
-    def test_status_method_when_playing_contains_time_with_length(self):
-        self.b.current_playlist.load([Track(length=10000)])
-        self.b.playback.play()
-        result = dict(self.h._status_status())
-        self.assert_('time' in result)
-        (position, total) = result['time'].split(':')
-        position = int(position)
-        total = int(total)
-        self.assert_(position <= total)
-
-    def test_status_method_when_playing_contains_elapsed(self):
-        self.b.playback.state = self.b.playback.PAUSED
-        self.b.playback._play_time_accumulated = 59123
-        result = dict(self.h._status_status())
-        self.assert_('elapsed' in result)
-        self.assertEqual(int(result['elapsed']), 59123)
-
-    def test_status_method_when_playing_contains_bitrate(self):
-        self.b.current_playlist.load([Track(bitrate=320)])
-        self.b.playback.play()
-        result = dict(self.h._status_status())
-        self.assert_('bitrate' in result)
-        self.assertEqual(int(result['bitrate']), 320)
-
-
-class PlaybackOptionsHandlerTest(unittest.TestCase):
-    def setUp(self):
-        self.m = DummyMixer()
-        self.b = DummyBackend(mixer=self.m)
-        self.h = frontend.MpdFrontend(backend=self.b)
-
-    def test_consume_off(self):
-        result = self.h.handle_request(u'consume "0"')
-        self.assertFalse(self.b.playback.consume)
-        self.assert_(u'OK' in result)
-
-    def test_consume_on(self):
-        result = self.h.handle_request(u'consume "1"')
-        self.assertTrue(self.b.playback.consume)
-        self.assert_(u'OK' in result)
-
-    def test_crossfade(self):
-        result = self.h.handle_request(u'crossfade "10"')
-        self.assert_(u'ACK [0@0] {} Not implemented' in result)
-
-    def test_random_off(self):
-        result = self.h.handle_request(u'random "0"')
-        self.assertFalse(self.b.playback.random)
-        self.assert_(u'OK' in result)
-
-    def test_random_on(self):
-        result = self.h.handle_request(u'random "1"')
-        self.assertTrue(self.b.playback.random)
-        self.assert_(u'OK' in result)
-
-    def test_repeat_off(self):
-        result = self.h.handle_request(u'repeat "0"')
-        self.assertFalse(self.b.playback.repeat)
-        self.assert_(u'OK' in result)
-
-    def test_repeat_on(self):
-        result = self.h.handle_request(u'repeat "1"')
-        self.assertTrue(self.b.playback.repeat)
-        self.assert_(u'OK' in result)
-
-    def test_setvol_below_min(self):
-        result = self.h.handle_request(u'setvol "-10"')
-        self.assert_(u'OK' in result)
-        self.assertEqual(0, self.b.mixer.volume)
-
-    def test_setvol_min(self):
-        result = self.h.handle_request(u'setvol "0"')
-        self.assert_(u'OK' in result)
-        self.assertEqual(0, self.b.mixer.volume)
-
-    def test_setvol_middle(self):
-        result = self.h.handle_request(u'setvol "50"')
-        self.assert_(u'OK' in result)
-        self.assertEqual(50, self.b.mixer.volume)
-
-    def test_setvol_max(self):
-        result = self.h.handle_request(u'setvol "100"')
-        self.assert_(u'OK' in result)
-        self.assertEqual(100, self.b.mixer.volume)
-
-    def test_setvol_above_max(self):
-        result = self.h.handle_request(u'setvol "110"')
-        self.assert_(u'OK' in result)
-        self.assertEqual(100, self.b.mixer.volume)
-
-    def test_setvol_plus_is_ignored(self):
-        result = self.h.handle_request(u'setvol "+10"')
-        self.assert_(u'OK' in result)
-        self.assertEqual(10, self.b.mixer.volume)
-
-    def test_single_off(self):
-        result = self.h.handle_request(u'single "0"')
-        self.assertFalse(self.b.playback.single)
-        self.assert_(u'OK' in result)
-
-    def test_single_on(self):
-        result = self.h.handle_request(u'single "1"')
-        self.assertTrue(self.b.playback.single)
-        self.assert_(u'OK' in result)
-
-    def test_replay_gain_mode_off(self):
-        result = self.h.handle_request(u'replay_gain_mode "off"')
-        self.assert_(u'ACK [0@0] {} Not implemented' in result)
-
-    def test_replay_gain_mode_track(self):
-        result = self.h.handle_request(u'replay_gain_mode "track"')
-        self.assert_(u'ACK [0@0] {} Not implemented' in result)
-
-    def test_replay_gain_mode_album(self):
-        result = self.h.handle_request(u'replay_gain_mode "album"')
-        self.assert_(u'ACK [0@0] {} Not implemented' in result)
-
-    def test_replay_gain_status_default(self):
-        expected = u'off'
-        result = self.h.handle_request(u'replay_gain_status')
-        self.assert_(u'OK' in result)
-        self.assert_(expected in result)
-
-    #def test_replay_gain_status_off(self):
-    #    expected = u'off'
-    #    self.h._replay_gain_mode(expected)
-    #    result = self.h.handle_request(u'replay_gain_status')
-    #    self.assert_(u'OK' in result)
-    #    self.assert_(expected in result)
-
-    #def test_replay_gain_status_track(self):
-    #    expected = u'track'
-    #    self.h._replay_gain_mode(expected)
-    #    result = self.h.handle_request(u'replay_gain_status')
-    #    self.assert_(u'OK' in result)
-    #    self.assert_(expected in result)
-
-    #def test_replay_gain_status_album(self):
-    #    expected = u'album'
-    #    self.h._replay_gain_mode(expected)
-    #    result = self.h.handle_request(u'replay_gain_status')
-    #    self.assert_(u'OK' in result)
-    #    self.assert_(expected in result)
-
-
-class PlaybackControlHandlerTest(unittest.TestCase):
-    def setUp(self):
-        self.m = DummyMixer()
-        self.b = DummyBackend(mixer=self.m)
-        self.h = frontend.MpdFrontend(backend=self.b)
-
-    def test_next(self):
-        result = self.h.handle_request(u'next')
-        self.assert_(u'OK' in result)
-
-    def test_pause_off(self):
-        track = Track()
-        self.b.current_playlist.load([track])
-        self.h.handle_request(u'play "0"')
-        self.h.handle_request(u'pause "1"')
-        result = self.h.handle_request(u'pause "0"')
-        self.assert_(u'OK' in result)
-        self.assertEqual(self.b.playback.PLAYING, self.b.playback.state)
-
-    def test_pause_on(self):
-        track = Track()
-        self.b.current_playlist.load([track])
-        self.h.handle_request(u'play "0"')
-        result = self.h.handle_request(u'pause "1"')
-        self.assert_(u'OK' in result)
-        self.assertEqual(self.b.playback.PAUSED, self.b.playback.state)
-
-    def test_play_without_pos(self):
-        track = Track()
-        self.b.current_playlist.load([track])
-        self.b.playback.state = self.b.playback.PAUSED
-        result = self.h.handle_request(u'play')
-        self.assert_(u'OK' in result)
-        self.assertEqual(self.b.playback.PLAYING, self.b.playback.state)
-
-    def test_play_with_pos(self):
-        self.b.current_playlist.load([Track()])
-        result = self.h.handle_request(u'play "0"')
-        self.assert_(u'OK' in result)
-        self.assertEqual(self.b.playback.PLAYING, self.b.playback.state)
-
-    def test_play_with_pos_out_of_bounds(self):
-        self.b.current_playlist.load([])
-        result = self.h.handle_request(u'play "0"')
-        self.assertEqual(result[0], u'ACK [2@0] {play} Bad song index')
-        self.assertEqual(self.b.playback.STOPPED, self.b.playback.state)
-
-    def test_play_minus_one_plays_first_in_playlist(self):
-        track = Track()
-        self.b.current_playlist.load([track])
-        result = self.h.handle_request(u'play "-1"')
-        self.assert_(u'OK' in result)
-        self.assertEqual(self.b.playback.PLAYING, self.b.playback.state)
-        self.assertEqual(self.b.playback.current_track, track)
-
-    def test_playid(self):
-        self.b.current_playlist.load([Track()])
-        result = self.h.handle_request(u'playid "1"')
-        self.assert_(u'OK' in result)
-        self.assertEqual(self.b.playback.PLAYING, self.b.playback.state)
-
-    def test_playid_minus_one_plays_first_in_playlist(self):
-        track = Track()
-        self.b.current_playlist.load([track])
-        result = self.h.handle_request(u'playid "-1"')
-        self.assert_(u'OK' in result)
-        self.assertEqual(self.b.playback.PLAYING, self.b.playback.state)
-        self.assertEqual(self.b.playback.current_track, track)
-
-    def test_playid_which_does_not_exist(self):
-        self.b.current_playlist.load([Track()])
-        result = self.h.handle_request(u'playid "12345"')
-        self.assertEqual(result[0], u'ACK [50@0] {playid} No such song')
-
-    def test_previous(self):
-        result = self.h.handle_request(u'previous')
-        self.assert_(u'OK' in result)
-
-    def test_seek(self):
-        result = self.h.handle_request(u'seek "0" "30"')
-        self.assert_(u'ACK [0@0] {} Not implemented' in result)
-
-    def test_seekid(self):
-        result = self.h.handle_request(u'seekid "0" "30"')
-        self.assert_(u'ACK [0@0] {} Not implemented' in result)
-
-    def test_stop(self):
-        result = self.h.handle_request(u'stop')
-        self.assert_(u'OK' in result)
-        self.assertEqual(self.b.playback.STOPPED, self.b.playback.state)
-
-
-class CurrentPlaylistHandlerTest(unittest.TestCase):
-    def setUp(self):
-        self.m = DummyMixer()
-        self.b = DummyBackend(mixer=self.m)
-        self.h = frontend.MpdFrontend(backend=self.b)
-
-    def test_add(self):
-        needle = Track(uri='dummy://foo')
-        self.b.library._library = [Track(), Track(), needle, Track()]
-        self.b.current_playlist.load(
-            [Track(), Track(), Track(), Track(), Track()])
-        self.assertEqual(len(self.b.current_playlist.tracks), 5)
-        result = self.h.handle_request(u'add "dummy://foo"')
-        self.assertEqual(len(self.b.current_playlist.tracks), 6)
-        self.assertEqual(self.b.current_playlist.tracks[5], needle)
-        self.assertEqual(len(result), 1)
-        self.assert_(u'OK' in result)
-
-    def test_add_with_uri_not_found_in_library_should_ack(self):
-        result = self.h.handle_request(u'add "dummy://foo"')
-        self.assertEqual(result[0],
-            u'ACK [50@0] {add} directory or file not found')
-
-    def test_addid_without_songpos(self):
-        needle = Track(uri='dummy://foo', id=137)
-        self.b.library._library = [Track(), Track(), needle, Track()]
-        self.b.current_playlist.load(
-            [Track(), Track(), Track(), Track(), Track()])
-        self.assertEqual(len(self.b.current_playlist.tracks), 5)
-        result = self.h.handle_request(u'addid "dummy://foo"')
-        self.assertEqual(len(self.b.current_playlist.tracks), 6)
-        self.assertEqual(self.b.current_playlist.tracks[5], needle)
-        self.assert_(u'Id: 137' in result)
-        self.assert_(u'OK' in result)
-
-    def test_addid_with_songpos(self):
-        needle = Track(uri='dummy://foo', id=137)
-        self.b.library._library = [Track(), Track(), needle, Track()]
-        self.b.current_playlist.load(
-            [Track(), Track(), Track(), Track(), Track()])
-        self.assertEqual(len(self.b.current_playlist.tracks), 5)
-        result = self.h.handle_request(u'addid "dummy://foo" "3"')
-        self.assertEqual(len(self.b.current_playlist.tracks), 6)
-        self.assertEqual(self.b.current_playlist.tracks[3], needle)
-        self.assert_(u'Id: 137' in result)
-        self.assert_(u'OK' in result)
-
-    def test_addid_with_songpos_out_of_bounds_should_ack(self):
-        needle = Track(uri='dummy://foo', id=137)
-        self.b.library._library = [Track(), Track(), needle, Track()]
-        self.b.current_playlist.load(
-            [Track(), Track(), Track(), Track(), Track()])
-        self.assertEqual(len(self.b.current_playlist.tracks), 5)
-        result = self.h.handle_request(u'addid "dummy://foo" "6"')
-        self.assertEqual(result[0], u'ACK [2@0] {addid} Bad song index')
-
-    def test_addid_with_uri_not_found_in_library_should_ack(self):
-        result = self.h.handle_request(u'addid "dummy://foo"')
-        self.assertEqual(result[0], u'ACK [50@0] {addid} No such song')
-
-    def test_clear(self):
-        self.b.current_playlist.load(
-            [Track(), Track(), Track(), Track(), Track()])
-        self.assertEqual(len(self.b.current_playlist.tracks), 5)
-        result = self.h.handle_request(u'clear')
-        self.assertEqual(len(self.b.current_playlist.tracks), 0)
-        self.assertEqual(self.b.playback.current_track, None)
-        self.assert_(u'OK' in result)
-
-    def test_delete_songpos(self):
-        self.b.current_playlist.load(
-            [Track(id=1), Track(id=2), Track(id=3), Track(id=4), Track(id=5)])
-        self.assertEqual(len(self.b.current_playlist.tracks), 5)
-        result = self.h.handle_request(u'delete "2"')
-        self.assertEqual(len(self.b.current_playlist.tracks), 4)
-        self.assert_(u'OK' in result)
-
-    def test_delete_songpos_out_of_bounds(self):
-        self.b.current_playlist.load(
-            [Track(), Track(), Track(), Track(), Track()])
-        self.assertEqual(len(self.b.current_playlist.tracks), 5)
-        result = self.h.handle_request(u'delete "5"')
-        self.assertEqual(len(self.b.current_playlist.tracks), 5)
-        self.assertEqual(result[0], u'ACK [2@0] {delete} Bad song index')
-
-    def test_delete_open_range(self):
-        self.b.current_playlist.load(
-            [Track(id=1), Track(id=2), Track(id=3), Track(id=4), Track(id=5)])
-        self.assertEqual(len(self.b.current_playlist.tracks), 5)
-        result = self.h.handle_request(u'delete "1:"')
-        self.assertEqual(len(self.b.current_playlist.tracks), 1)
-        self.assert_(u'OK' in result)
-
-    def test_delete_closed_range(self):
-        self.b.current_playlist.load(
-            [Track(id=1), Track(id=2), Track(id=3), Track(id=4), Track(id=5)])
-        self.assertEqual(len(self.b.current_playlist.tracks), 5)
-        result = self.h.handle_request(u'delete "1:3"')
-        self.assertEqual(len(self.b.current_playlist.tracks), 3)
-        self.assert_(u'OK' in result)
-
-    def test_delete_range_out_of_bounds(self):
-        self.b.current_playlist.load(
-            [Track(), Track(), Track(), Track(), Track()])
-        self.assertEqual(len(self.b.current_playlist.tracks), 5)
-        result = self.h.handle_request(u'delete "5:7"')
-        self.assertEqual(len(self.b.current_playlist.tracks), 5)
-        self.assertEqual(result[0], u'ACK [2@0] {delete} Bad song index')
-
-    def test_deleteid(self):
-        self.b.current_playlist.load([Track(), Track()])
-        self.assertEqual(len(self.b.current_playlist.tracks), 2)
-        result = self.h.handle_request(u'deleteid "2"')
-        self.assertEqual(len(self.b.current_playlist.tracks), 1)
-        self.assert_(u'OK' in result)
-
-    def test_deleteid_does_not_exist(self):
-        self.b.current_playlist.load([Track(), Track()])
-        self.assertEqual(len(self.b.current_playlist.tracks), 2)
-        result = self.h.handle_request(u'deleteid "12345"')
-        self.assertEqual(len(self.b.current_playlist.tracks), 2)
-        self.assertEqual(result[0], u'ACK [50@0] {deleteid} No such song')
-
-    def test_move_songpos(self):
-        self.b.current_playlist.load([
-            Track(name='a'), Track(name='b'), Track(name='c'),
-            Track(name='d'), Track(name='e'), Track(name='f'),
-        ])
-        result = self.h.handle_request(u'move "1" "0"')
-        self.assertEqual(self.b.current_playlist.tracks[0].name, 'b')
-        self.assertEqual(self.b.current_playlist.tracks[1].name, 'a')
-        self.assertEqual(self.b.current_playlist.tracks[2].name, 'c')
-        self.assertEqual(self.b.current_playlist.tracks[3].name, 'd')
-        self.assertEqual(self.b.current_playlist.tracks[4].name, 'e')
-        self.assertEqual(self.b.current_playlist.tracks[5].name, 'f')
-        self.assert_(u'OK' in result)
-
-    def test_move_open_range(self):
-        self.b.current_playlist.load([
-            Track(name='a'), Track(name='b'), Track(name='c'),
-            Track(name='d'), Track(name='e'), Track(name='f'),
-        ])
-        result = self.h.handle_request(u'move "2:" "0"')
-        self.assertEqual(self.b.current_playlist.tracks[0].name, 'c')
-        self.assertEqual(self.b.current_playlist.tracks[1].name, 'd')
-        self.assertEqual(self.b.current_playlist.tracks[2].name, 'e')
-        self.assertEqual(self.b.current_playlist.tracks[3].name, 'f')
-        self.assertEqual(self.b.current_playlist.tracks[4].name, 'a')
-        self.assertEqual(self.b.current_playlist.tracks[5].name, 'b')
-        self.assert_(u'OK' in result)
-
-    def test_move_closed_range(self):
-        self.b.current_playlist.load([
-            Track(name='a'), Track(name='b'), Track(name='c'),
-            Track(name='d'), Track(name='e'), Track(name='f'),
-        ])
-        result = self.h.handle_request(u'move "1:3" "0"')
-        self.assertEqual(self.b.current_playlist.tracks[0].name, 'b')
-        self.assertEqual(self.b.current_playlist.tracks[1].name, 'c')
-        self.assertEqual(self.b.current_playlist.tracks[2].name, 'a')
-        self.assertEqual(self.b.current_playlist.tracks[3].name, 'd')
-        self.assertEqual(self.b.current_playlist.tracks[4].name, 'e')
-        self.assertEqual(self.b.current_playlist.tracks[5].name, 'f')
-        self.assert_(u'OK' in result)
-
-    def test_moveid(self):
-        self.b.current_playlist.load([
-            Track(name='a'), Track(name='b'), Track(name='c'),
-            Track(name='d'), Track(name='e'), Track(name='f'),
-        ])
-        result = self.h.handle_request(u'moveid "5" "2"')
-        self.assertEqual(self.b.current_playlist.tracks[0].name, 'a')
-        self.assertEqual(self.b.current_playlist.tracks[1].name, 'b')
-        self.assertEqual(self.b.current_playlist.tracks[2].name, 'e')
-        self.assertEqual(self.b.current_playlist.tracks[3].name, 'c')
-        self.assertEqual(self.b.current_playlist.tracks[4].name, 'd')
-        self.assertEqual(self.b.current_playlist.tracks[5].name, 'f')
-        self.assert_(u'OK' in result)
-
-    def test_playlist_returns_same_as_playlistinfo(self):
-        playlist_result = self.h.handle_request(u'playlist')
-        playlistinfo_result = self.h.handle_request(u'playlistinfo')
-        self.assertEqual(playlist_result, playlistinfo_result)
-
-    def test_playlistfind(self):
-        result = self.h.handle_request(u'playlistfind "tag" "needle"')
-        self.assert_(u'ACK [0@0] {} Not implemented' in result)
-
-    def test_playlistfind_by_filename(self):
-        result = self.h.handle_request(
-            u'playlistfind "filename" "file:///dev/null"')
-        self.assert_(u'OK' in result)
-
-    def test_playlistfind_by_filename_without_quotes(self):
-        result = self.h.handle_request(
-            u'playlistfind filename "file:///dev/null"')
-        self.assert_(u'OK' in result)
-
-    def test_playlistfind_by_filename_in_current_playlist(self):
-        self.b.current_playlist.load([
-            Track(uri='file:///exists')])
-        result = self.h.handle_request(
-            u'playlistfind filename "file:///exists"')
-        self.assert_(u'file: file:///exists' in result)
-        self.assert_(u'OK' in result)
-
-    def test_playlistid_without_songid(self):
-        self.b.current_playlist.load([Track(name='a'), Track(name='b')])
-        result = self.h.handle_request(u'playlistid')
-        self.assert_(u'Title: a' in result)
-        self.assert_(u'Title: b' in result)
-        self.assert_(u'OK' in result)
-
-    def test_playlistid_with_songid(self):
-        self.b.current_playlist.load([Track(name='a'), Track(name='b')])
-        result = self.h.handle_request(u'playlistid "2"')
-        self.assert_(u'Title: a' not in result)
-        self.assert_(u'Id: 1' not in result)
-        self.assert_(u'Title: b' in result)
-        self.assert_(u'Id: 2' in result)
-        self.assert_(u'OK' in result)
-
-    def test_playlistid_with_not_existing_songid_fails(self):
-        self.b.current_playlist.load([Track(name='a'), Track(name='b')])
-        result = self.h.handle_request(u'playlistid "25"')
-        self.assertEqual(result[0], u'ACK [50@0] {playlistid} No such song')
-
-    def test_playlistinfo_without_songpos_or_range(self):
-        self.b.current_playlist.load([
-            Track(name='a'), Track(name='b'), Track(name='c'),
-            Track(name='d'), Track(name='e'), Track(name='f'),
-        ])
-        result = self.h.handle_request(u'playlistinfo')
-        self.assert_(u'Title: a' in result)
-        self.assert_(u'Title: b' in result)
-        self.assert_(u'Title: c' in result)
-        self.assert_(u'Title: d' in result)
-        self.assert_(u'Title: e' in result)
-        self.assert_(u'Title: f' in result)
-        self.assert_(u'OK' in result)
-
-    def test_playlistinfo_with_songpos(self):
-        self.b.current_playlist.load([
-            Track(name='a'), Track(name='b'), Track(name='c'),
-            Track(name='d'), Track(name='e'), Track(name='f'),
-        ])
-        result = self.h.handle_request(u'playlistinfo "4"')
-        self.assert_(u'Title: a' not in result)
-        self.assert_(u'Title: b' not in result)
-        self.assert_(u'Title: c' not in result)
-        self.assert_(u'Title: d' not in result)
-        self.assert_(u'Title: e' in result)
-        self.assert_(u'Title: f' not in result)
-        self.assert_(u'OK' in result)
-
-    def test_playlistinfo_with_negative_songpos_same_as_playlistinfo(self):
-        result1 = self.h.handle_request(u'playlistinfo "-1"')
-        result2 = self.h.handle_request(u'playlistinfo')
-        self.assertEqual(result1, result2)
-
-    def test_playlistinfo_with_open_range(self):
-        self.b.current_playlist.load([
-            Track(name='a'), Track(name='b'), Track(name='c'),
-            Track(name='d'), Track(name='e'), Track(name='f'),
-        ])
-        result = self.h.handle_request(u'playlistinfo "2:"')
-        self.assert_(u'Title: a' not in result)
-        self.assert_(u'Title: b' not in result)
-        self.assert_(u'Title: c' in result)
-        self.assert_(u'Title: d' in result)
-        self.assert_(u'Title: e' in result)
-        self.assert_(u'Title: f' in result)
-        self.assert_(u'OK' in result)
-
-    def test_playlistinfo_with_closed_range(self):
-        self.b.current_playlist.load([
-            Track(name='a'), Track(name='b'), Track(name='c'),
-            Track(name='d'), Track(name='e'), Track(name='f'),
-        ])
-        result = self.h.handle_request(u'playlistinfo "2:4"')
-        self.assert_(u'Title: a' not in result)
-        self.assert_(u'Title: b' not in result)
-        self.assert_(u'Title: c' in result)
-        self.assert_(u'Title: d' in result)
-        self.assert_(u'Title: e' not in result)
-        self.assert_(u'Title: f' not in result)
-        self.assert_(u'OK' in result)
-
-    def test_playlistinfo_with_too_high_start_of_range_returns_arg_error(self):
-        result = self.h.handle_request(u'playlistinfo "10:20"')
-        self.assert_(u'ACK [2@0] {playlistinfo} Bad song index' in result)
-
-    def test_playlistinfo_with_too_high_end_of_range_returns_ok(self):
-        result = self.h.handle_request(u'playlistinfo "0:20"')
-        self.assert_(u'OK' in result)
-
-    def test_playlistsearch(self):
-        result = self.h.handle_request(u'playlistsearch "tag" "needle"')
-        self.assert_(u'ACK [0@0] {} Not implemented' in result)
-
-    def test_plchanges(self):
-        self.b.current_playlist.load(
-            [Track(name='a'), Track(name='b'), Track(name='c')])
-        result = self.h.handle_request(u'plchanges "0"')
-        self.assert_(u'Title: a' in result)
-        self.assert_(u'Title: b' in result)
-        self.assert_(u'Title: c' in result)
-        self.assert_(u'OK' in result)
-
-    def test_plchangesposid(self):
-        self.b.current_playlist.load(
-            [Track(id=11), Track(id=12), Track(id=13)])
-        result = self.h.handle_request(u'plchangesposid "0"')
-        self.assert_(u'cpos: 0' in result)
-        self.assert_(u'Id: 11' in result)
-        self.assert_(u'cpos: 2' in result)
-        self.assert_(u'Id: 12' in result)
-        self.assert_(u'cpos: 2' in result)
-        self.assert_(u'Id: 13' in result)
-        self.assert_(u'OK' in result)
-
-    def test_shuffle_without_range(self):
-        self.b.current_playlist.load([
-            Track(name='a'), Track(name='b'), Track(name='c'),
-            Track(name='d'), Track(name='e'), Track(name='f'),
-        ])
-        version = self.b.current_playlist.version
-        result = self.h.handle_request(u'shuffle')
-        self.assert_(version < self.b.current_playlist.version)
-        self.assert_(u'OK' in result)
-
-    def test_shuffle_with_open_range(self):
-        self.b.current_playlist.load([
-            Track(name='a'), Track(name='b'), Track(name='c'),
-            Track(name='d'), Track(name='e'), Track(name='f'),
-        ])
-        version = self.b.current_playlist.version
-        result = self.h.handle_request(u'shuffle "4:"')
-        self.assert_(version < self.b.current_playlist.version)
-        self.assertEqual(self.b.current_playlist.tracks[0].name, 'a')
-        self.assertEqual(self.b.current_playlist.tracks[1].name, 'b')
-        self.assertEqual(self.b.current_playlist.tracks[2].name, 'c')
-        self.assertEqual(self.b.current_playlist.tracks[3].name, 'd')
-        self.assert_(u'OK' in result)
-
-    def test_shuffle_with_closed_range(self):
-        self.b.current_playlist.load([
-            Track(name='a'), Track(name='b'), Track(name='c'),
-            Track(name='d'), Track(name='e'), Track(name='f'),
-        ])
-        version = self.b.current_playlist.version
-        result = self.h.handle_request(u'shuffle "1:3"')
-        self.assert_(version < self.b.current_playlist.version)
-        self.assertEqual(self.b.current_playlist.tracks[0].name, 'a')
-        self.assertEqual(self.b.current_playlist.tracks[3].name, 'd')
-        self.assertEqual(self.b.current_playlist.tracks[4].name, 'e')
-        self.assertEqual(self.b.current_playlist.tracks[5].name, 'f')
-        self.assert_(u'OK' in result)
-
-    def test_swap(self):
-        self.b.current_playlist.load([
-            Track(name='a'), Track(name='b'), Track(name='c'),
-            Track(name='d'), Track(name='e'), Track(name='f'),
-        ])
-        result = self.h.handle_request(u'swap "1" "4"')
-        self.assertEqual(self.b.current_playlist.tracks[0].name, 'a')
-        self.assertEqual(self.b.current_playlist.tracks[1].name, 'e')
-        self.assertEqual(self.b.current_playlist.tracks[2].name, 'c')
-        self.assertEqual(self.b.current_playlist.tracks[3].name, 'd')
-        self.assertEqual(self.b.current_playlist.tracks[4].name, 'b')
-        self.assertEqual(self.b.current_playlist.tracks[5].name, 'f')
-        self.assert_(u'OK' in result)
-
-    def test_swapid(self):
-        self.b.current_playlist.load([
-            Track(name='a'), Track(name='b'), Track(name='c'),
-            Track(name='d'), Track(name='e'), Track(name='f'),
-        ])
-        result = self.h.handle_request(u'swapid "2" "5"')
-        self.assertEqual(self.b.current_playlist.tracks[0].name, 'a')
-        self.assertEqual(self.b.current_playlist.tracks[1].name, 'e')
-        self.assertEqual(self.b.current_playlist.tracks[2].name, 'c')
-        self.assertEqual(self.b.current_playlist.tracks[3].name, 'd')
-        self.assertEqual(self.b.current_playlist.tracks[4].name, 'b')
-        self.assertEqual(self.b.current_playlist.tracks[5].name, 'f')
-        self.assert_(u'OK' in result)
-
-
-class StoredPlaylistsHandlerTest(unittest.TestCase):
-    def setUp(self):
-        self.m = DummyMixer()
-        self.b = DummyBackend(mixer=self.m)
-        self.h = frontend.MpdFrontend(backend=self.b)
-
-    def test_listplaylist(self):
-        self.b.stored_playlists.playlists = [
-            Playlist(name='name', tracks=[Track(uri='file:///dev/urandom')])]
-        result = self.h.handle_request(u'listplaylist "name"')
-        self.assert_(u'file: file:///dev/urandom' in result)
-        self.assert_(u'OK' in result)
-
-    def test_listplaylist_fails_if_no_playlist_is_found(self):
-        result = self.h.handle_request(u'listplaylist "name"')
-        self.assertEqual(result[0],
-            u'ACK [50@0] {listplaylist} No such playlist')
-
-    def test_listplaylistinfo(self):
-        self.b.stored_playlists.playlists = [
-            Playlist(name='name', tracks=[Track(uri='file:///dev/urandom')])]
-        result = self.h.handle_request(u'listplaylistinfo "name"')
-        self.assert_(u'file: file:///dev/urandom' in result)
-        self.assert_(u'Track: 0' in result)
-        self.assert_(u'Pos: 0' not in result)
-        self.assert_(u'OK' in result)
-
-    def test_listplaylistinfo_fails_if_no_playlist_is_found(self):
-        result = self.h.handle_request(u'listplaylistinfo "name"')
-        self.assertEqual(result[0],
-            u'ACK [50@0] {listplaylistinfo} No such playlist')
-
-    def test_listplaylists(self):
-        last_modified = dt.datetime(2001, 3, 17, 13, 41, 17, 12345)
-        self.b.stored_playlists.playlists = [Playlist(name='a',
-            last_modified=last_modified)]
-        result = self.h.handle_request(u'listplaylists')
-        self.assert_(u'playlist: a' in result)
-        # Date without microseconds and with time zone information
-        self.assert_(u'Last-Modified: 2001-03-17T13:41:17Z' in result)
-        self.assert_(u'OK' in result)
-
-    def test_load(self):
-        result = self.h.handle_request(u'load "name"')
-        self.assert_(u'OK' in result)
-
-    def test_load_appends(self):
-        raise SkipTest
-
-    def test_playlistadd(self):
-        result = self.h.handle_request(
-            u'playlistadd "name" "file:///dev/urandom"')
-        self.assert_(u'ACK [0@0] {} Not implemented' in result)
-
-    def test_playlistclear(self):
-        result = self.h.handle_request(u'playlistclear "name"')
-        self.assert_(u'ACK [0@0] {} Not implemented' in result)
-
-    def test_playlistdelete(self):
-        result = self.h.handle_request(u'playlistdelete "name" "5"')
-        self.assert_(u'ACK [0@0] {} Not implemented' in result)
-
-    def test_playlistmove(self):
-        result = self.h.handle_request(u'playlistmove "name" "5" "10"')
-        self.assert_(u'ACK [0@0] {} Not implemented' in result)
-
-    def test_rename(self):
-        result = self.h.handle_request(u'rename "old_name" "new_name"')
-        self.assert_(u'ACK [0@0] {} Not implemented' in result)
-
-    def test_rm(self):
-        result = self.h.handle_request(u'rm "name"')
-        self.assert_(u'ACK [0@0] {} Not implemented' in result)
-
-    def test_save(self):
-        result = self.h.handle_request(u'save "name"')
-        self.assert_(u'ACK [0@0] {} Not implemented' in result)
-
-
-class MusicDatabaseHandlerTest(unittest.TestCase):
-    def setUp(self):
-        self.m = DummyMixer()
-        self.b = DummyBackend(mixer=self.m)
-        self.h = frontend.MpdFrontend(backend=self.b)
-
-    def test_count(self):
-        result = self.h.handle_request(u'count "tag" "needle"')
-        self.assert_(u'songs: 0' in result)
-        self.assert_(u'playtime: 0' in result)
-        self.assert_(u'OK' in result)
-
-    def test_find_album(self):
-        result = self.h.handle_request(u'find "album" "what"')
-        self.assert_(u'OK' in result)
-
-    def test_find_album_without_quotes(self):
-        result = self.h.handle_request(u'find album "what"')
-        self.assert_(u'OK' in result)
-
-    def test_find_artist(self):
-        result = self.h.handle_request(u'find "artist" "what"')
-        self.assert_(u'OK' in result)
-
-    def test_find_artist_without_quotes(self):
-        result = self.h.handle_request(u'find artist "what"')
-        self.assert_(u'OK' in result)
-
-    def test_find_title(self):
-        result = self.h.handle_request(u'find "title" "what"')
-        self.assert_(u'OK' in result)
-
-    def test_find_title_without_quotes(self):
-        result = self.h.handle_request(u'find title "what"')
-        self.assert_(u'OK' in result)
-
-    def test_find_else_should_fail(self):
-        result = self.h.handle_request(u'find "somethingelse" "what"')
-        self.assertEqual(result[0], u'ACK [2@0] {find} incorrect arguments')
-
-    def test_find_album_and_artist(self):
-        result = self.h.handle_request(u'find album "album_what" artist "artist_what"')
-        self.assert_(u'OK' in result)
-
-    def test_findadd(self):
-        result = self.h.handle_request(u'findadd "album" "what"')
-        self.assert_(u'OK' in result)
-
-    def test_list_artist(self):
-        result = self.h.handle_request(u'list "artist"')
-        self.assert_(u'OK' in result)
-
-    def test_list_artist_without_quotes(self):
-        result = self.h.handle_request(u'list artist')
-        self.assert_(u'OK' in result)
-
-    def test_list_artist_without_quotes_and_capitalized(self):
-        result = self.h.handle_request(u'list Artist')
-        self.assert_(u'OK' in result)
-
-    def test_list_artist_with_artist_should_fail(self):
-        result = self.h.handle_request(u'list "artist" "anartist"')
-        self.assertEqual(result[0], u'ACK [2@0] {list} incorrect arguments')
-
-    def test_list_album_without_artist(self):
-        result = self.h.handle_request(u'list "album"')
-        self.assert_(u'OK' in result)
-
-    def test_list_album_with_artist(self):
-        result = self.h.handle_request(u'list "album" "anartist"')
-        self.assert_(u'OK' in result)
-    
-    def test_list_album_artist_with_artist_without_quotes(self):
-        result = self.h.handle_request(u'list album artist "anartist"')
-        self.assert_(u'OK' in result)
-
-    def test_listall(self):
-        result = self.h.handle_request(u'listall "file:///dev/urandom"')
-        self.assert_(u'ACK [0@0] {} Not implemented' in result)
-
-    def test_listallinfo(self):
-        result = self.h.handle_request(u'listallinfo "file:///dev/urandom"')
-        self.assert_(u'ACK [0@0] {} Not implemented' in result)
-
-    def test_lsinfo_without_path_returns_same_as_listplaylists(self):
-        lsinfo_result = self.h.handle_request(u'lsinfo')
-        listplaylists_result = self.h.handle_request(u'listplaylists')
-        self.assertEqual(lsinfo_result, listplaylists_result)
-
-    def test_lsinfo_with_empty_path_returns_same_as_listplaylists(self):
-        lsinfo_result = self.h.handle_request(u'lsinfo ""')
-        listplaylists_result = self.h.handle_request(u'listplaylists')
-        self.assertEqual(lsinfo_result, listplaylists_result)
-
-    def test_lsinfo_for_root_returns_same_as_listplaylists(self):
-        lsinfo_result = self.h.handle_request(u'lsinfo "/"')
-        listplaylists_result = self.h.handle_request(u'listplaylists')
-        self.assertEqual(lsinfo_result, listplaylists_result)
-
-    def test_search_album(self):
-        result = self.h.handle_request(u'search "album" "analbum"')
-        self.assert_(u'OK' in result)
-
-    def test_search_album_without_quotes(self):
-        result = self.h.handle_request(u'search album "analbum"')
-        self.assert_(u'OK' in result)
-
-    def test_search_artist(self):
-        result = self.h.handle_request(u'search "artist" "anartist"')
-        self.assert_(u'OK' in result)
-
-    def test_search_artist_without_quotes(self):
-        result = self.h.handle_request(u'search artist "anartist"')
-        self.assert_(u'OK' in result)
-
-    def test_search_filename(self):
-        result = self.h.handle_request(u'search "filename" "afilename"')
-        self.assert_(u'OK' in result)
-
-    def test_search_filename_without_quotes(self):
-        result = self.h.handle_request(u'search filename "afilename"')
-        self.assert_(u'OK' in result)
-
-    def test_search_title(self):
-        result = self.h.handle_request(u'search "title" "atitle"')
-        self.assert_(u'OK' in result)
-
-    def test_search_title_without_quotes(self):
-        result = self.h.handle_request(u'search title "atitle"')
-        self.assert_(u'OK' in result)
-
-    def test_search_any(self):
-        result = self.h.handle_request(u'search "any" "anything"')
-        self.assert_(u'OK' in result)
-
-    def test_search_any_without_quotes(self):
-        result = self.h.handle_request(u'search any "anything"')
-        self.assert_(u'OK' in result)
-
-    def test_search_else_should_fail(self):
-        result = self.h.handle_request(u'search "sometype" "something"')
-        self.assertEqual(result[0], u'ACK [2@0] {search} incorrect arguments')
-
-    def test_update_without_uri(self):
-        result = self.h.handle_request(u'update')
-        self.assert_(u'OK' in result)
-        self.assert_(u'updating_db: 0' in result)
-
-    def test_update_with_uri(self):
-        result = self.h.handle_request(u'update "file:///dev/urandom"')
-        self.assert_(u'OK' in result)
-        self.assert_(u'updating_db: 0' in result)
-
-    def test_rescan_without_uri(self):
-        result = self.h.handle_request(u'rescan')
-        self.assert_(u'OK' in result)
-        self.assert_(u'updating_db: 0' in result)
-
-    def test_rescan_with_uri(self):
-        result = self.h.handle_request(u'rescan "file:///dev/urandom"')
-        self.assert_(u'OK' in result)
-        self.assert_(u'updating_db: 0' in result)
-
-
-class StickersHandlerTest(unittest.TestCase):
-    def setUp(self):
-        self.m = DummyMixer()
-        self.b = DummyBackend(mixer=self.m)
-        self.h = frontend.MpdFrontend(backend=self.b)
-
-    def test_sticker_get(self):
-        result = self.h.handle_request(
-            u'sticker get "song" "file:///dev/urandom" "a_name"')
-        self.assert_(u'ACK [0@0] {} Not implemented' in result)
-
-    def test_sticker_set(self):
-        result = self.h.handle_request(
-            u'sticker set "song" "file:///dev/urandom" "a_name" "a_value"')
-        self.assert_(u'ACK [0@0] {} Not implemented' in result)
-
-    def test_sticker_delete_with_name(self):
-        result = self.h.handle_request(
-            u'sticker delete "song" "file:///dev/urandom" "a_name"')
-        self.assert_(u'ACK [0@0] {} Not implemented' in result)
-
-    def test_sticker_delete_without_name(self):
-        result = self.h.handle_request(
-            u'sticker delete "song" "file:///dev/urandom"')
-        self.assert_(u'ACK [0@0] {} Not implemented' in result)
-
-    def test_sticker_list(self):
-        result = self.h.handle_request(
-            u'sticker list "song" "file:///dev/urandom"')
-        self.assert_(u'ACK [0@0] {} Not implemented' in result)
-
-    def test_sticker_find(self):
-        result = self.h.handle_request(
-            u'sticker find "song" "file:///dev/urandom" "a_name"')
-        self.assert_(u'ACK [0@0] {} Not implemented' in result)
-
-
-class ConnectionHandlerTest(unittest.TestCase):
-    def setUp(self):
-        self.m = DummyMixer()
-        self.b = DummyBackend(mixer=self.m)
-        self.h = frontend.MpdFrontend(backend=self.b)
-
-    def test_close(self):
-        result = self.h.handle_request(u'close')
-        self.assert_(u'OK' in result)
-
-    def test_empty_request(self):
-        result = self.h.handle_request(u'')
-        self.assert_(u'OK' in result)
-
-    def test_kill(self):
-        result = self.h.handle_request(u'kill')
-        self.assert_(u'OK' in result)
-
-    def test_password(self):
-        result = self.h.handle_request(u'password "secret"')
-        self.assert_(u'ACK [0@0] {} Not implemented' in result)
-
-    def test_ping(self):
-        result = self.h.handle_request(u'ping')
-        self.assert_(u'OK' in result)
-
-
-class AudioOutputHandlerTest(unittest.TestCase):
-    def setUp(self):
-        self.m = DummyMixer()
-        self.b = DummyBackend(mixer=self.m)
-        self.h = frontend.MpdFrontend(backend=self.b)
-
-    def test_enableoutput(self):
-        result = self.h.handle_request(u'enableoutput "0"')
-        self.assert_(u'ACK [0@0] {} Not implemented' in result)
-
-    def test_disableoutput(self):
-        result = self.h.handle_request(u'disableoutput "0"')
-        self.assert_(u'ACK [0@0] {} Not implemented' in result)
-
-    def test_outputs(self):
-        result = self.h.handle_request(u'outputs')
-        self.assert_(u'outputid: 0' in result)
-        self.assert_(u'outputname: DummyBackend' in result)
-        self.assert_(u'outputenabled: 1' in result)
-        self.assert_(u'OK' in result)
-
-
-class ReflectionHandlerTest(unittest.TestCase):
-    def setUp(self):
-        self.m = DummyMixer()
-        self.b = DummyBackend(mixer=self.m)
-        self.h = frontend.MpdFrontend(backend=self.b)
-
-    def test_commands_returns_list_of_all_commands(self):
-        result = self.h.handle_request(u'commands')
-        # Check if some random commands are included
-        self.assert_(u'command: commands' in result)
-        self.assert_(u'command: play' in result)
-        self.assert_(u'command: status' in result)
-        # Check if the blacklisted commands are not present
-        self.assert_(u'command: command_list_begin' not in result)
-        self.assert_(u'command: command_list_ok_begin' not in result)
-        self.assert_(u'command: command_list_end' not in result)
-        self.assert_(u'command: idle' not in result)
-        self.assert_(u'command: noidle' not in result)
-        self.assert_(u'command: sticker' not in result)
-        self.assert_(u'OK' in result)
-
-    def test_decoders(self):
-        result = self.h.handle_request(u'decoders')
-        self.assert_(u'ACK [0@0] {} Not implemented' in result)
-
-    def test_notcommands_returns_only_ok(self):
-        result = self.h.handle_request(u'notcommands')
-        self.assertEqual(1, len(result))
-        self.assert_(u'OK' in result)
-
-    def test_tagtypes(self):
-        result = self.h.handle_request(u'tagtypes')
-        self.assert_(u'OK' in result)
-
-    def test_urlhandlers(self):
-        result = self.h.handle_request(u'urlhandlers')
-        self.assert_(u'OK' in result)
-        self.assert_(u'handler: dummy:' in result)
diff --git a/tests/mpd/music_db_test.py b/tests/mpd/music_db_test.py
new file mode 100644
index 00000000..5256ada4
--- /dev/null
+++ b/tests/mpd/music_db_test.py
@@ -0,0 +1,168 @@
+import unittest
+
+from mopidy.backends.dummy import DummyBackend
+from mopidy.mixers.dummy import DummyMixer
+from mopidy.mpd import frontend
+
+class MusicDatabaseHandlerTest(unittest.TestCase):
+    def setUp(self):
+        self.m = DummyMixer()
+        self.b = DummyBackend(mixer=self.m)
+        self.h = frontend.MpdFrontend(backend=self.b)
+
+    def test_count(self):
+        result = self.h.handle_request(u'count "tag" "needle"')
+        self.assert_(u'songs: 0' in result)
+        self.assert_(u'playtime: 0' in result)
+        self.assert_(u'OK' in result)
+
+    def test_find_album(self):
+        result = self.h.handle_request(u'find "album" "what"')
+        self.assert_(u'OK' in result)
+
+    def test_find_album_without_quotes(self):
+        result = self.h.handle_request(u'find album "what"')
+        self.assert_(u'OK' in result)
+
+    def test_find_artist(self):
+        result = self.h.handle_request(u'find "artist" "what"')
+        self.assert_(u'OK' in result)
+
+    def test_find_artist_without_quotes(self):
+        result = self.h.handle_request(u'find artist "what"')
+        self.assert_(u'OK' in result)
+
+    def test_find_title(self):
+        result = self.h.handle_request(u'find "title" "what"')
+        self.assert_(u'OK' in result)
+
+    def test_find_title_without_quotes(self):
+        result = self.h.handle_request(u'find title "what"')
+        self.assert_(u'OK' in result)
+
+    def test_find_else_should_fail(self):
+        result = self.h.handle_request(u'find "somethingelse" "what"')
+        self.assertEqual(result[0], u'ACK [2@0] {find} incorrect arguments')
+
+    def test_find_album_and_artist(self):
+        result = self.h.handle_request(u'find album "album_what" artist "artist_what"')
+        self.assert_(u'OK' in result)
+
+    def test_findadd(self):
+        result = self.h.handle_request(u'findadd "album" "what"')
+        self.assert_(u'OK' in result)
+
+    def test_list_artist(self):
+        result = self.h.handle_request(u'list "artist"')
+        self.assert_(u'OK' in result)
+
+    def test_list_artist_without_quotes(self):
+        result = self.h.handle_request(u'list artist')
+        self.assert_(u'OK' in result)
+
+    def test_list_artist_without_quotes_and_capitalized(self):
+        result = self.h.handle_request(u'list Artist')
+        self.assert_(u'OK' in result)
+
+    def test_list_artist_with_artist_should_fail(self):
+        result = self.h.handle_request(u'list "artist" "anartist"')
+        self.assertEqual(result[0], u'ACK [2@0] {list} incorrect arguments')
+
+    def test_list_album_without_artist(self):
+        result = self.h.handle_request(u'list "album"')
+        self.assert_(u'OK' in result)
+
+    def test_list_album_with_artist(self):
+        result = self.h.handle_request(u'list "album" "anartist"')
+        self.assert_(u'OK' in result)
+    
+    def test_list_album_artist_with_artist_without_quotes(self):
+        result = self.h.handle_request(u'list album artist "anartist"')
+        self.assert_(u'OK' in result)
+
+    def test_listall(self):
+        result = self.h.handle_request(u'listall "file:///dev/urandom"')
+        self.assert_(u'ACK [0@0] {} Not implemented' in result)
+
+    def test_listallinfo(self):
+        result = self.h.handle_request(u'listallinfo "file:///dev/urandom"')
+        self.assert_(u'ACK [0@0] {} Not implemented' in result)
+
+    def test_lsinfo_without_path_returns_same_as_listplaylists(self):
+        lsinfo_result = self.h.handle_request(u'lsinfo')
+        listplaylists_result = self.h.handle_request(u'listplaylists')
+        self.assertEqual(lsinfo_result, listplaylists_result)
+
+    def test_lsinfo_with_empty_path_returns_same_as_listplaylists(self):
+        lsinfo_result = self.h.handle_request(u'lsinfo ""')
+        listplaylists_result = self.h.handle_request(u'listplaylists')
+        self.assertEqual(lsinfo_result, listplaylists_result)
+
+    def test_lsinfo_for_root_returns_same_as_listplaylists(self):
+        lsinfo_result = self.h.handle_request(u'lsinfo "/"')
+        listplaylists_result = self.h.handle_request(u'listplaylists')
+        self.assertEqual(lsinfo_result, listplaylists_result)
+
+    def test_search_album(self):
+        result = self.h.handle_request(u'search "album" "analbum"')
+        self.assert_(u'OK' in result)
+
+    def test_search_album_without_quotes(self):
+        result = self.h.handle_request(u'search album "analbum"')
+        self.assert_(u'OK' in result)
+
+    def test_search_artist(self):
+        result = self.h.handle_request(u'search "artist" "anartist"')
+        self.assert_(u'OK' in result)
+
+    def test_search_artist_without_quotes(self):
+        result = self.h.handle_request(u'search artist "anartist"')
+        self.assert_(u'OK' in result)
+
+    def test_search_filename(self):
+        result = self.h.handle_request(u'search "filename" "afilename"')
+        self.assert_(u'OK' in result)
+
+    def test_search_filename_without_quotes(self):
+        result = self.h.handle_request(u'search filename "afilename"')
+        self.assert_(u'OK' in result)
+
+    def test_search_title(self):
+        result = self.h.handle_request(u'search "title" "atitle"')
+        self.assert_(u'OK' in result)
+
+    def test_search_title_without_quotes(self):
+        result = self.h.handle_request(u'search title "atitle"')
+        self.assert_(u'OK' in result)
+
+    def test_search_any(self):
+        result = self.h.handle_request(u'search "any" "anything"')
+        self.assert_(u'OK' in result)
+
+    def test_search_any_without_quotes(self):
+        result = self.h.handle_request(u'search any "anything"')
+        self.assert_(u'OK' in result)
+
+    def test_search_else_should_fail(self):
+        result = self.h.handle_request(u'search "sometype" "something"')
+        self.assertEqual(result[0], u'ACK [2@0] {search} incorrect arguments')
+
+    def test_update_without_uri(self):
+        result = self.h.handle_request(u'update')
+        self.assert_(u'OK' in result)
+        self.assert_(u'updating_db: 0' in result)
+
+    def test_update_with_uri(self):
+        result = self.h.handle_request(u'update "file:///dev/urandom"')
+        self.assert_(u'OK' in result)
+        self.assert_(u'updating_db: 0' in result)
+
+    def test_rescan_without_uri(self):
+        result = self.h.handle_request(u'rescan')
+        self.assert_(u'OK' in result)
+        self.assert_(u'updating_db: 0' in result)
+
+    def test_rescan_with_uri(self):
+        result = self.h.handle_request(u'rescan "file:///dev/urandom"')
+        self.assert_(u'OK' in result)
+        self.assert_(u'updating_db: 0' in result)
diff --git a/tests/mpd/playback_test.py b/tests/mpd/playback_test.py
new file mode 100644
index 00000000..b3806090
--- /dev/null
+++ b/tests/mpd/playback_test.py
@@ -0,0 +1,217 @@
+import unittest
+
+from mopidy.backends.dummy import DummyBackend
+from mopidy.mixers.dummy import DummyMixer
+from mopidy.models import Track
+from mopidy.mpd import frontend
+
+class PlaybackOptionsHandlerTest(unittest.TestCase):
+    def setUp(self):
+        self.m = DummyMixer()
+        self.b = DummyBackend(mixer=self.m)
+        self.h = frontend.MpdFrontend(backend=self.b)
+
+    def test_consume_off(self):
+        result = self.h.handle_request(u'consume "0"')
+        self.assertFalse(self.b.playback.consume)
+        self.assert_(u'OK' in result)
+
+    def test_consume_on(self):
+        result = self.h.handle_request(u'consume "1"')
+        self.assertTrue(self.b.playback.consume)
+        self.assert_(u'OK' in result)
+
+    def test_crossfade(self):
+        result = self.h.handle_request(u'crossfade "10"')
+        self.assert_(u'ACK [0@0] {} Not implemented' in result)
+
+    def test_random_off(self):
+        result = self.h.handle_request(u'random "0"')
+        self.assertFalse(self.b.playback.random)
+        self.assert_(u'OK' in result)
+
+    def test_random_on(self):
+        result = self.h.handle_request(u'random "1"')
+        self.assertTrue(self.b.playback.random)
+        self.assert_(u'OK' in result)
+
+    def test_repeat_off(self):
+        result = self.h.handle_request(u'repeat "0"')
+        self.assertFalse(self.b.playback.repeat)
+        self.assert_(u'OK' in result)
+
+    def test_repeat_on(self):
+        result = self.h.handle_request(u'repeat "1"')
+        self.assertTrue(self.b.playback.repeat)
+        self.assert_(u'OK' in result)
+
+    def test_setvol_below_min(self):
+        result = self.h.handle_request(u'setvol "-10"')
+        self.assert_(u'OK' in result)
+        self.assertEqual(0, self.b.mixer.volume)
+
+    def test_setvol_min(self):
+        result = self.h.handle_request(u'setvol "0"')
+        self.assert_(u'OK' in result)
+        self.assertEqual(0, self.b.mixer.volume)
+
+    def test_setvol_middle(self):
+        result = self.h.handle_request(u'setvol "50"')
+        self.assert_(u'OK' in result)
+        self.assertEqual(50, self.b.mixer.volume)
+
+    def test_setvol_max(self):
+        result = self.h.handle_request(u'setvol "100"')
+        self.assert_(u'OK' in result)
+        self.assertEqual(100, self.b.mixer.volume)
+
+    def test_setvol_above_max(self):
+        result = self.h.handle_request(u'setvol "110"')
+        self.assert_(u'OK' in result)
+        self.assertEqual(100, self.b.mixer.volume)
+
+    def test_setvol_plus_is_ignored(self):
+        result = self.h.handle_request(u'setvol "+10"')
+        self.assert_(u'OK' in result)
+        self.assertEqual(10, self.b.mixer.volume)
+
+    def test_single_off(self):
+        result = self.h.handle_request(u'single "0"')
+        self.assertFalse(self.b.playback.single)
+        self.assert_(u'OK' in result)
+
+    def test_single_on(self):
+        result = self.h.handle_request(u'single "1"')
+        self.assertTrue(self.b.playback.single)
+        self.assert_(u'OK' in result)
+
+    def test_replay_gain_mode_off(self):
+        result = self.h.handle_request(u'replay_gain_mode "off"')
+        self.assert_(u'ACK [0@0] {} Not implemented' in result)
+
+    def test_replay_gain_mode_track(self):
+        result = self.h.handle_request(u'replay_gain_mode "track"')
+        self.assert_(u'ACK [0@0] {} Not implemented' in result)
+
+    def test_replay_gain_mode_album(self):
+        result = self.h.handle_request(u'replay_gain_mode "album"')
+        self.assert_(u'ACK [0@0] {} Not implemented' in result)
+
+    def test_replay_gain_status_default(self):
+        expected = u'off'
+        result = self.h.handle_request(u'replay_gain_status')
+        self.assert_(u'OK' in result)
+        self.assert_(expected in result)
+
+    #def test_replay_gain_status_off(self):
+    #    expected = u'off'
+    #    self.h._replay_gain_mode(expected)
+    #    result = self.h.handle_request(u'replay_gain_status')
+    #    self.assert_(u'OK' in result)
+    #    self.assert_(expected in result)
+
+    #def test_replay_gain_status_track(self):
+    #    expected = u'track'
+    #    self.h._replay_gain_mode(expected)
+    #    result = self.h.handle_request(u'replay_gain_status')
+    #    self.assert_(u'OK' in result)
+    #    self.assert_(expected in result)
+
+    #def test_replay_gain_status_album(self):
+    #    expected = u'album'
+    #    self.h._replay_gain_mode(expected)
+    #    result = self.h.handle_request(u'replay_gain_status')
+    #    self.assert_(u'OK' in result)
+    #    self.assert_(expected in result)
+
+
+class PlaybackControlHandlerTest(unittest.TestCase):
+    def setUp(self):
+        self.m = DummyMixer()
+        self.b = DummyBackend(mixer=self.m)
+        self.h = frontend.MpdFrontend(backend=self.b)
+
+    def test_next(self):
+        result = self.h.handle_request(u'next')
+        self.assert_(u'OK' in result)
+
+    def test_pause_off(self):
+        track = Track()
+        self.b.current_playlist.load([track])
+        self.h.handle_request(u'play "0"')
+        self.h.handle_request(u'pause "1"')
+        result = self.h.handle_request(u'pause "0"')
+        self.assert_(u'OK' in result)
+        self.assertEqual(self.b.playback.PLAYING, self.b.playback.state)
+
+    def test_pause_on(self):
+        track = Track()
+        self.b.current_playlist.load([track])
+        self.h.handle_request(u'play "0"')
+        result = self.h.handle_request(u'pause "1"')
+        self.assert_(u'OK' in result)
+        self.assertEqual(self.b.playback.PAUSED, self.b.playback.state)
+
+    def test_play_without_pos(self):
+        track = Track()
+        self.b.current_playlist.load([track])
+        self.b.playback.state = self.b.playback.PAUSED
+        result = self.h.handle_request(u'play')
+        self.assert_(u'OK' in result)
+        self.assertEqual(self.b.playback.PLAYING, self.b.playback.state)
+
+    def test_play_with_pos(self):
+        self.b.current_playlist.load([Track()])
+        result = self.h.handle_request(u'play "0"')
+        self.assert_(u'OK' in result)
+        self.assertEqual(self.b.playback.PLAYING, self.b.playback.state)
+
+    def test_play_with_pos_out_of_bounds(self):
+        self.b.current_playlist.load([])
+        result = self.h.handle_request(u'play "0"')
+        self.assertEqual(result[0], u'ACK [2@0] {play} Bad song index')
+        self.assertEqual(self.b.playback.STOPPED, self.b.playback.state)
+
+    def test_play_minus_one_plays_first_in_playlist(self):
+        track = Track()
+        self.b.current_playlist.load([track])
+        result = self.h.handle_request(u'play "-1"')
+        self.assert_(u'OK' in result)
+        self.assertEqual(self.b.playback.PLAYING, self.b.playback.state)
+        self.assertEqual(self.b.playback.current_track, track)
+
+    def test_playid(self):
+        self.b.current_playlist.load([Track()])
+        result = self.h.handle_request(u'playid "1"')
+        self.assert_(u'OK' in result)
+        self.assertEqual(self.b.playback.PLAYING, self.b.playback.state)
+
+    def test_playid_minus_one_plays_first_in_playlist(self):
+        track = Track()
+        self.b.current_playlist.load([track])
+        result = self.h.handle_request(u'playid "-1"')
+        self.assert_(u'OK' in result)
+        self.assertEqual(self.b.playback.PLAYING, self.b.playback.state)
+        self.assertEqual(self.b.playback.current_track, track)
+
+    def test_playid_which_does_not_exist(self):
+        self.b.current_playlist.load([Track()])
+        result = self.h.handle_request(u'playid "12345"')
+        self.assertEqual(result[0], u'ACK [50@0] {playid} No such song')
+
+    def test_previous(self):
+        result = self.h.handle_request(u'previous')
+        self.assert_(u'OK' in result)
+
+    def test_seek(self):
+        result = self.h.handle_request(u'seek "0" "30"')
+        self.assert_(u'ACK [0@0] {} Not implemented' in result)
+
+    def test_seekid(self):
+        result = self.h.handle_request(u'seekid "0" "30"')
+        self.assert_(u'ACK [0@0] {} Not implemented' in result)
+
+    def test_stop(self):
+        result = self.h.handle_request(u'stop')
+        self.assert_(u'OK' in result)
+        self.assertEqual(self.b.playback.STOPPED, self.b.playback.state)
diff --git a/tests/mpd/reflection_test.py b/tests/mpd/reflection_test.py
new file mode 100644
index 00000000..70af604f
--- /dev/null
+++ b/tests/mpd/reflection_test.py
@@ -0,0 +1,44 @@
+import unittest
+
+from mopidy.backends.dummy import DummyBackend
+from mopidy.mixers.dummy import DummyMixer
+from mopidy.mpd import frontend
+
+class ReflectionHandlerTest(unittest.TestCase):
+    def setUp(self):
+        self.m = DummyMixer()
+        self.b = DummyBackend(mixer=self.m)
+        self.h = frontend.MpdFrontend(backend=self.b)
+
+    def test_commands_returns_list_of_all_commands(self):
+        result = self.h.handle_request(u'commands')
+        # Check if some random commands are included
+        self.assert_(u'command: commands' in result)
+        self.assert_(u'command: play' in result)
+        self.assert_(u'command: status' in result)
+        # Check if the blacklisted commands are not present
+        self.assert_(u'command: command_list_begin' not in result)
+        self.assert_(u'command: command_list_ok_begin' not in result)
+        self.assert_(u'command: command_list_end' not in result)
+        self.assert_(u'command: idle' not in result)
+        self.assert_(u'command: noidle' not in result)
+        self.assert_(u'command: sticker' not in result)
+        self.assert_(u'OK' in result)
+
+    def test_decoders(self):
+        result = self.h.handle_request(u'decoders')
+        self.assert_(u'ACK [0@0] {} Not implemented' in result)
+
+    def test_notcommands_returns_only_ok(self):
+        result = self.h.handle_request(u'notcommands')
+        self.assertEqual(1, len(result))
+        self.assert_(u'OK' in result)
+
+    def test_tagtypes(self):
+        result = self.h.handle_request(u'tagtypes')
+        self.assert_(u'OK' in result)
+
+    def test_urlhandlers(self):
+        result = self.h.handle_request(u'urlhandlers')
+        self.assert_(u'OK' in result)
+        self.assert_(u'handler: dummy:' in result)
diff --git a/tests/mpd/request_handler_test.py b/tests/mpd/request_handler_test.py
new file mode 100644
index 00000000..1dcba9ad
--- /dev/null
+++ b/tests/mpd/request_handler_test.py
@@ -0,0 +1,48 @@
+import unittest
+
+from mopidy.backends.dummy import DummyBackend
+from mopidy.mixers.dummy import DummyMixer
+from mopidy.mpd import frontend, MpdAckError
+
+class RequestHandlerTest(unittest.TestCase):
+    def setUp(self):
+        self.m = DummyMixer()
+        self.b = DummyBackend(mixer=self.m)
+        self.h = frontend.MpdFrontend(backend=self.b)
+
+    def test_register_same_pattern_twice_fails(self):
+        func = lambda: None
+        try:
+            frontend.handle_pattern('a pattern')(func)
+            frontend.handle_pattern('a pattern')(func)
+            self.fail('Registering a pattern twice shoulde raise ValueError')
+        except ValueError:
+            pass
+
+    def test_finding_handler_for_unknown_command_raises_exception(self):
+        try:
+            self.h.find_handler('an_unknown_command with args')
+            self.fail('Should raise exception')
+        except MpdAckError as e:
+            self.assertEqual(e.get_mpd_ack(),
+                u'ACK [5@0] {} unknown command "an_unknown_command"')
+
+    def test_finding_handler_for_known_command_returns_handler_and_kwargs(self):
+        expected_handler = lambda x: None
+        frontend._request_handlers['known_command (?P<arg1>.+)'] = \
+            expected_handler
+        (handler, kwargs) = self.h.find_handler('known_command an_arg')
+        self.assertEqual(handler, expected_handler)
+        self.assert_('arg1' in kwargs)
+        self.assertEqual(kwargs['arg1'], 'an_arg')
+
+    def test_handling_unknown_request_yields_error(self):
+        result = self.h.handle_request('an unhandled request')
+        self.assertEqual(result[0], u'ACK [5@0] {} unknown command "an"')
+
+    def test_handling_known_request(self):
+        expected = 'magic'
+        frontend._request_handlers['known request'] = lambda x: expected
+        result = self.h.handle_request('known request')
+        self.assert_(u'OK' in result)
+        self.assert_(expected in result)
diff --git a/tests/mpd/status_test.py b/tests/mpd/status_test.py
new file mode 100644
index 00000000..ae1ac816
--- /dev/null
+++ b/tests/mpd/status_test.py
@@ -0,0 +1,204 @@
+import unittest
+
+from mopidy.backends.dummy import DummyBackend
+from mopidy.mixers.dummy import DummyMixer
+from mopidy.models import Track
+from mopidy.mpd import frontend
+
+class StatusHandlerTest(unittest.TestCase):
+    def setUp(self):
+        self.m = DummyMixer()
+        self.b = DummyBackend(mixer=self.m)
+        self.h = frontend.MpdFrontend(backend=self.b)
+
+    def test_clearerror(self):
+        result = self.h.handle_request(u'clearerror')
+        self.assert_(u'ACK [0@0] {} Not implemented' in result)
+
+    def test_currentsong(self):
+        track = Track()
+        self.b.current_playlist.load([track])
+        self.b.playback.play()
+        result = self.h.handle_request(u'currentsong')
+        self.assert_(u'file: ' in result)
+        self.assert_(u'Time: 0' in result)
+        self.assert_(u'Artist: ' in result)
+        self.assert_(u'Title: ' in result)
+        self.assert_(u'Album: ' in result)
+        self.assert_(u'Track: 0' in result)
+        self.assert_(u'Date: ' in result)
+        self.assert_(u'Pos: 0' in result)
+        self.assert_(u'Id: 1' in result)
+        self.assert_(u'OK' in result)
+
+    def test_currentsong_without_song(self):
+        result = self.h.handle_request(u'currentsong')
+        self.assert_(u'OK' in result)
+
+    def test_idle_without_subsystems(self):
+        result = self.h.handle_request(u'idle')
+        self.assert_(u'OK' in result)
+
+    def test_idle_with_subsystems(self):
+        result = self.h.handle_request(u'idle database playlist')
+        self.assert_(u'OK' in result)
+
+    def test_noidle(self):
+        result = self.h.handle_request(u'noidle')
+        self.assert_(u'OK' in result)
+
+    def test_stats_command(self):
+        result = self.h.handle_request(u'stats')
+        self.assert_(u'OK' in result)
+
+    def test_stats_method(self):
+        result = self.h._status_stats()
+        self.assert_('artists' in result)
+        self.assert_(int(result['artists']) >= 0)
+        self.assert_('albums' in result)
+        self.assert_(int(result['albums']) >= 0)
+        self.assert_('songs' in result)
+        self.assert_(int(result['songs']) >= 0)
+        self.assert_('uptime' in result)
+        self.assert_(int(result['uptime']) >= 0)
+        self.assert_('db_playtime' in result)
+        self.assert_(int(result['db_playtime']) >= 0)
+        self.assert_('db_update' in result)
+        self.assert_(int(result['db_update']) >= 0)
+        self.assert_('playtime' in result)
+        self.assert_(int(result['playtime']) >= 0)
+
+    def test_status_command(self):
+        result = self.h.handle_request(u'status')
+        self.assert_(u'OK' in result)
+
+    def test_status_method_contains_volume_which_defaults_to_0(self):
+        result = dict(self.h._status_status())
+        self.assert_('volume' in result)
+        self.assertEqual(int(result['volume']), 0)
+
+    def test_status_method_contains_volume(self):
+        self.b.mixer.volume = 17
+        result = dict(self.h._status_status())
+        self.assert_('volume' in result)
+        self.assertEqual(int(result['volume']), 17)
+
+    def test_status_method_contains_repeat_is_0(self):
+        result = dict(self.h._status_status())
+        self.assert_('repeat' in result)
+        self.assertEqual(int(result['repeat']), 0)
+
+    def test_status_method_contains_repeat_is_1(self):
+        self.b.playback.repeat = 1
+        result = dict(self.h._status_status())
+        self.assert_('repeat' in result)
+        self.assertEqual(int(result['repeat']), 1)
+
+    def test_status_method_contains_random_is_0(self):
+        result = dict(self.h._status_status())
+        self.assert_('random' in result)
+        self.assertEqual(int(result['random']), 0)
+
+    def test_status_method_contains_random_is_1(self):
+        self.b.playback.random = 1
+        result = dict(self.h._status_status())
+        self.assert_('random' in result)
+        self.assertEqual(int(result['random']), 1)
+
+    def test_status_method_contains_single(self):
+        result = dict(self.h._status_status())
+        self.assert_('single' in result)
+        self.assert_(int(result['single']) in (0, 1))
+
+    def test_status_method_contains_consume_is_0(self):
+        result = dict(self.h._status_status())
+        self.assert_('consume' in result)
+        self.assertEqual(int(result['consume']), 0)
+
+    def test_status_method_contains_consume_is_1(self):
+        self.b.playback.consume = 1
+        result = dict(self.h._status_status())
+        self.assert_('consume' in result)
+        self.assertEqual(int(result['consume']), 1)
+
+    def test_status_method_contains_playlist(self):
+        result = dict(self.h._status_status())
+        self.assert_('playlist' in result)
+        self.assert_(int(result['playlist']) in xrange(0, 2**31 - 1))
+
+    def test_status_method_contains_playlistlength(self):
+        result = dict(self.h._status_status())
+        self.assert_('playlistlength' in result)
+        self.assert_(int(result['playlistlength']) >= 0)
+
+    def test_status_method_contains_xfade(self):
+        result = dict(self.h._status_status())
+        self.assert_('xfade' in result)
+        self.assert_(int(result['xfade']) >= 0)
+
+    def test_status_method_contains_state_is_play(self):
+        self.b.playback.state = self.b.playback.PLAYING
+        result = dict(self.h._status_status())
+        self.assert_('state' in result)
+        self.assertEqual(result['state'], 'play')
+
+    def test_status_method_contains_state_is_stop(self):
+        self.b.playback.state = self.b.playback.STOPPED
+        result = dict(self.h._status_status())
+        self.assert_('state' in result)
+        self.assertEqual(result['state'], 'stop')
+
+    def test_status_method_contains_state_is_pause(self):
+        self.b.playback.state = self.b.playback.PLAYING
+        self.b.playback.state = self.b.playback.PAUSED
+        result = dict(self.h._status_status())
+        self.assert_('state' in result)
+        self.assertEqual(result['state'], 'pause')
+
+    def test_status_method_when_playlist_loaded_contains_song(self):
+        self.b.current_playlist.load([Track()])
+        self.b.playback.play()
+        result = dict(self.h._status_status())
+        self.assert_('song' in result)
+        self.assert_(int(result['song']) >= 0)
+
+    def test_status_method_when_playlist_loaded_contains_cpid_as_songid(self):
+        self.b.current_playlist.load([Track()])
+        self.b.playback.play()
+        result = dict(self.h._status_status())
+        self.assert_('songid' in result)
+        self.assertEqual(int(result['songid']), 1)
+
+    def test_status_method_when_playing_contains_time_with_no_length(self):
+        self.b.current_playlist.load([Track(length=None)])
+        self.b.playback.play()
+        result = dict(self.h._status_status())
+        self.assert_('time' in result)
+        (position, total) = result['time'].split(':')
+        position = int(position)
+        total = int(total)
+        self.assert_(position <= total)
+
+    def test_status_method_when_playing_contains_time_with_length(self):
+        self.b.current_playlist.load([Track(length=10000)])
+        self.b.playback.play()
+        result = dict(self.h._status_status())
+        self.assert_('time' in result)
+        (position, total) = result['time'].split(':')
+        position = int(position)
+        total = int(total)
+        self.assert_(position <= total)
+
+    def test_status_method_when_playing_contains_elapsed(self):
+        self.b.playback.state = self.b.playback.PAUSED
+        self.b.playback._play_time_accumulated = 59123
+        result = dict(self.h._status_status())
+        self.assert_('elapsed' in result)
+        self.assertEqual(int(result['elapsed']), 59123)
+
+    def test_status_method_when_playing_contains_bitrate(self):
+        self.b.current_playlist.load([Track(bitrate=320)])
+        self.b.playback.play()
+        result = dict(self.h._status_status())
+        self.assert_('bitrate' in result)
+        self.assertEqual(int(result['bitrate']), 320)
diff --git a/tests/mpd/stickers_test.py b/tests/mpd/stickers_test.py
new file mode 100644
index 00000000..437251a4
--- /dev/null
+++ b/tests/mpd/stickers_test.py
@@ -0,0 +1,41 @@
+import unittest
+
+from mopidy.backends.dummy import DummyBackend
+from mopidy.mixers.dummy import DummyMixer
+from mopidy.mpd import frontend
+
+class StickersHandlerTest(unittest.TestCase):
+    def setUp(self):
+        self.m = DummyMixer()
+        self.b = DummyBackend(mixer=self.m)
+        self.h = frontend.MpdFrontend(backend=self.b)
+
+    def test_sticker_get(self):
+        result = self.h.handle_request(
+            u'sticker get "song" "file:///dev/urandom" "a_name"')
+        self.assert_(u'ACK [0@0] {} Not implemented' in result)
+
+    def test_sticker_set(self):
+        result = self.h.handle_request(
+            u'sticker set "song" "file:///dev/urandom" "a_name" "a_value"')
+        self.assert_(u'ACK [0@0] {} Not implemented' in result)
+
+    def test_sticker_delete_with_name(self):
+        result = self.h.handle_request(
+            u'sticker delete "song" "file:///dev/urandom" "a_name"')
+        self.assert_(u'ACK [0@0] {} Not implemented' in result)
+
+    def test_sticker_delete_without_name(self):
+        result = self.h.handle_request(
+            u'sticker delete "song" "file:///dev/urandom"')
+        self.assert_(u'ACK [0@0] {} Not implemented' in result)
+
+    def test_sticker_list(self):
+        result = self.h.handle_request(
+            u'sticker list "song" "file:///dev/urandom"')
+        self.assert_(u'ACK [0@0] {} Not implemented' in result)
+
+    def test_sticker_find(self):
+        result = self.h.handle_request(
+            u'sticker find "song" "file:///dev/urandom" "a_name"')
+        self.assert_(u'ACK [0@0] {} Not implemented' in result)
diff --git a/tests/mpd/stored_playlists_test.py b/tests/mpd/stored_playlists_test.py
new file mode 100644
index 00000000..b616695e
--- /dev/null
+++ b/tests/mpd/stored_playlists_test.py
@@ -0,0 +1,87 @@
+import datetime as dt
+import unittest
+
+from mopidy.backends.dummy import DummyBackend
+from mopidy.mixers.dummy import DummyMixer
+from mopidy.models import Track, Playlist
+from mopidy.mpd import frontend
+
+from tests import SkipTest
+
+class StoredPlaylistsHandlerTest(unittest.TestCase):
+    def setUp(self):
+        self.m = DummyMixer()
+        self.b = DummyBackend(mixer=self.m)
+        self.h = frontend.MpdFrontend(backend=self.b)
+
+    def test_listplaylist(self):
+        self.b.stored_playlists.playlists = [
+            Playlist(name='name', tracks=[Track(uri='file:///dev/urandom')])]
+        result = self.h.handle_request(u'listplaylist "name"')
+        self.assert_(u'file: file:///dev/urandom' in result)
+        self.assert_(u'OK' in result)
+
+    def test_listplaylist_fails_if_no_playlist_is_found(self):
+        result = self.h.handle_request(u'listplaylist "name"')
+        self.assertEqual(result[0],
+            u'ACK [50@0] {listplaylist} No such playlist')
+
+    def test_listplaylistinfo(self):
+        self.b.stored_playlists.playlists = [
+            Playlist(name='name', tracks=[Track(uri='file:///dev/urandom')])]
+        result = self.h.handle_request(u'listplaylistinfo "name"')
+        self.assert_(u'file: file:///dev/urandom' in result)
+        self.assert_(u'Track: 0' in result)
+        self.assert_(u'Pos: 0' not in result)
+        self.assert_(u'OK' in result)
+
+    def test_listplaylistinfo_fails_if_no_playlist_is_found(self):
+        result = self.h.handle_request(u'listplaylistinfo "name"')
+        self.assertEqual(result[0],
+            u'ACK [50@0] {listplaylistinfo} No such playlist')
+
+    def test_listplaylists(self):
+        last_modified = dt.datetime(2001, 3, 17, 13, 41, 17, 12345)
+        self.b.stored_playlists.playlists = [Playlist(name='a',
+            last_modified=last_modified)]
+        result = self.h.handle_request(u'listplaylists')
+        self.assert_(u'playlist: a' in result)
+        # Date without microseconds and with time zone information
+        self.assert_(u'Last-Modified: 2001-03-17T13:41:17Z' in result)
+        self.assert_(u'OK' in result)
+
+    def test_load(self):
+        result = self.h.handle_request(u'load "name"')
+        self.assert_(u'OK' in result)
+
+    def test_load_appends(self):
+        raise SkipTest
+
+    def test_playlistadd(self):
+        result = self.h.handle_request(
+            u'playlistadd "name" "file:///dev/urandom"')
+        self.assert_(u'ACK [0@0] {} Not implemented' in result)
+
+    def test_playlistclear(self):
+        result = self.h.handle_request(u'playlistclear "name"')
+        self.assert_(u'ACK [0@0] {} Not implemented' in result)
+
+    def test_playlistdelete(self):
+        result = self.h.handle_request(u'playlistdelete "name" "5"')
+        self.assert_(u'ACK [0@0] {} Not implemented' in result)
+
+    def test_playlistmove(self):
+        result = self.h.handle_request(u'playlistmove "name" "5" "10"')
+        self.assert_(u'ACK [0@0] {} Not implemented' in result)
+
+    def test_rename(self):
+        result = self.h.handle_request(u'rename "old_name" "new_name"')
+        self.assert_(u'ACK [0@0] {} Not implemented' in result)
+
+    def test_rm(self):
+        result = self.h.handle_request(u'rm "name"')
+        self.assert_(u'ACK [0@0] {} Not implemented' in result)
+
+    def test_save(self):
+        result = self.h.handle_request(u'save "name"')
+        self.assert_(u'ACK [0@0] {} Not implemented' in result)