Fix song-songbook, tests