Renaming, cleanup, etc. Fixed testSong().