Added more discogs work, renamed tests