diff --git a/src/test/java/br/com/caelum/tubaina/parser/html/CenteredParagraphTagTest.java b/src/test/java/br/com/caelum/tubaina/parser/html/CenteredParagraphTagTest.java
index b1cb448..0abb3b0 100644
--- a/src/test/java/br/com/caelum/tubaina/parser/html/CenteredParagraphTagTest.java
+++ b/src/test/java/br/com/caelum/tubaina/parser/html/CenteredParagraphTagTest.java
@@ -8,6 +8,6 @@ public class CenteredParagraphTagTest {
 	public void testCenteredParagraphTest() {
 		CenteredParagraphTag tag = new CenteredParagraphTag();
 		String result = tag.parse("texto centralizado", null);
-		Assert.assertEquals("<div style=\"text-align:center\">texto centralizado</div>", result);
+		Assert.assertEquals("<p class=\"center\">texto centralizado</p>", result);
 	}
 }
diff --git a/src/test/java/br/com/caelum/tubaina/parser/html/HtmlGeneratorTest.java b/src/test/java/br/com/caelum/tubaina/parser/html/HtmlGeneratorTest.java
index 7a87c70..e4cdc0f 100644
--- a/src/test/java/br/com/caelum/tubaina/parser/html/HtmlGeneratorTest.java
+++ b/src/test/java/br/com/caelum/tubaina/parser/html/HtmlGeneratorTest.java
@@ -133,37 +133,25 @@ public void testGeneratorWithDoubledImage() throws TubainaException, IOException
 		Book b = builder.build();
 		try {
 			generator.generate(b, temp);
-		} catch (TubainaException t) {
-			Assert.fail("Should not raise an exception");
+		} catch (TubainaException e) {
+			Assert.fail("Should not complain if one uses twice the same image");
 		}
-		// OK
 	}
 
-	@Test
+	@Test(expected=TubainaException.class)
 	public void testGeneratorWithUnexistantImage() throws TubainaException, IOException {
 		BookBuilder builder = new BookBuilder("Com imagens");
 		builder.add(new StringReader("[chapter qualquer um]\n" + "[img src/test/resources/someImage.gif]"));
-		try {
-			Book b = builder.build();
-			generator.generate(b, temp);
-			Assert.fail("Should raise an exception");
-		} catch (TubainaException t) {
-			// OK
-		}
+		Book b = builder.build();
+		generator.generate(b, temp);
 	}
 
-	@Test
+	@Test(expected=TubainaException.class)
 	public void testGeneratorWithDuppedChapterName() throws TubainaException, IOException {
 		BookBuilder builder = new BookBuilder("teste");
 		builder.add(new StringReader("[chapter qualquer um]\n" + "alguma coisa\n[chapter qualquer um]outra coisa"));
-		try {
-			Book b = builder.build();
-			generator.generate(b, temp);
-			Assert.fail("Should raise an exception");
-		} catch (TubainaException t) {
-			System.out.println(t.getMessage());
-			// OK
-		}
+		Book b = builder.build();
+		generator.generate(b, temp);
 	}
 
 	@Test