Refactor tests for paired down paragraph classes