Fix test failures, lyrics and files with spaces in them.