btw, the new content handling made these tests much easier to write :)