Added another couple of tests, begin to refactor the mpd module tobe less of a mess.