A couple of fixes + tests around providing a function that gets the content.