Updated class fields to allow for easier unit testing
Updated class fields to allow for easier unit testing

ibmibmibm/beets,jackwilsdon/beets,SusannaMaria/beets,beetbox/beets,sampsyo/beets,ibmibmibm/beets,shamangeorge/beets,shamangeorge/beets,sampsyo/beets,beetbox/beets,SusannaMaria/beets,SusannaMaria/beets,jackwilsdon/beets,shamangeorge/beets,ibmibmibm/beets,ibmibmibm/beets,jackwilsdon/beets,sampsyo/beets,beetbox/beets,beetbox/beets,sampsyo/beets,shamangeorge/beets,jackwilsdon/beets,SusannaMaria/beets