Refactor tests.
Begin parsing of content classes.