Fix parser testfiles

@fmmoret lyrics doesn't work, can you focus on getting they lyrics to pass the tests? (may involve modifying the tests)

@jpmccabe and I can work on the dozen or so other minor bugs in the parsers