TestMusicBrainzClient added, some refactor