Some of the song import tests were not being run, and pytest was warning
about them. I refactored them so that pytest would run them again.
Also, there were some other warnings in the code about deprecations, so
I fixed as many of those as I could too.