Lyrics test

Fix a bug in `strip_cruft` that enables us to suppress code + adding tests for uncovered functions.