Converting more parts of content into utilities/tests