Cleaned up obsolete code that was ported over from the old mpd class for backwards compatibility.  Also added more unit tests.