Fix up Album and Track mbid tests