diff --git a/src/exception_test.cc b/src/exception_test.cc
index 2392a31..adb32d1 100644
--- a/src/exception_test.cc
+++ b/src/exception_test.cc
@@ -149,14 +149,14 @@
                trace_array->Get(0)->GetDeclaringClass()->ToModifiedUtf8().c_str());
   EXPECT_STREQ("ExceptionHandle.java", trace_array->Get(0)->GetFileName()->ToModifiedUtf8().c_str());
   EXPECT_STREQ("g", trace_array->Get(0)->GetMethodName()->ToModifiedUtf8().c_str());
-  EXPECT_EQ(22, trace_array->Get(0)->GetLineNumber());
+  EXPECT_EQ(37, trace_array->Get(0)->GetLineNumber());
 
   ASSERT_TRUE(trace_array->Get(1) != NULL);
   EXPECT_STREQ("ExceptionHandle",
                trace_array->Get(1)->GetDeclaringClass()->ToModifiedUtf8().c_str());
   EXPECT_STREQ("ExceptionHandle.java", trace_array->Get(1)->GetFileName()->ToModifiedUtf8().c_str());
   EXPECT_STREQ("f", trace_array->Get(1)->GetMethodName()->ToModifiedUtf8().c_str());
-  EXPECT_EQ(7, trace_array->Get(1)->GetLineNumber());
+  EXPECT_EQ(22, trace_array->Get(1)->GetLineNumber());
 }
 
 }  // namespace art
diff --git a/test/034-call-null/expected.txt b/test/034-call-null/expected.txt
index 7697a32..582b35e 100644
--- a/test/034-call-null/expected.txt
+++ b/test/034-call-null/expected.txt
@@ -1,2 +1,2 @@
 java.lang.NullPointerException
-	at Main.main(Main.java:12)
+	at Main.main(Main.java:26)
diff --git a/test/038-inner-null/expected.txt b/test/038-inner-null/expected.txt
index 6932c50..d3aab89 100644
--- a/test/038-inner-null/expected.txt
+++ b/test/038-inner-null/expected.txt
@@ -1,4 +1,4 @@
 new Special()
 java.lang.NullPointerException
-	at Main$Special.callInner(Main.java:17)
-	at Main.main(Main.java:6)
+	at Main$Special.callInner(Main.java:31)
+	at Main.main(Main.java:20)
diff --git a/test/054-uncaught/expected.txt b/test/054-uncaught/expected.txt
index e443a07..7d7f03c 100644
--- a/test/054-uncaught/expected.txt
+++ b/test/054-uncaught/expected.txt
@@ -1,20 +1,20 @@
 Test 1
 Uncaught exception DEFAULT!
 java.lang.NullPointerException: Hi diddly-ho, neighborino.
-	at Main.catchTheUncaught(Main.java:49)
-	at Main$Helper.run(Main.java:60)
+	at Main.catchTheUncaught(Main.java:63)
+	at Main$Helper.run(Main.java:74)
 Test 2
 Uncaught exception THREAD!
 java.lang.NullPointerException: Hi diddly-ho, neighborino.
-	at Main.catchTheUncaught(Main.java:49)
-	at Main$Helper.run(Main.java:60)
+	at Main.catchTheUncaught(Main.java:63)
+	at Main$Helper.run(Main.java:74)
 Test 3
 Uncaught exception THREAD!
 java.lang.NullPointerException: Hi diddly-ho, neighborino.
-	at Main.catchTheUncaught(Main.java:49)
-	at Main$Helper.run(Main.java:60)
+	at Main.catchTheUncaught(Main.java:63)
+	at Main$Helper.run(Main.java:74)
 Test 1
 Uncaught exception DEFAULT!
 java.lang.NullPointerException: Hi diddly-ho, neighborino.
-	at Main.catchTheUncaught(Main.java:49)
-	at Main.main(Main.java:12)
+	at Main.catchTheUncaught(Main.java:63)
+	at Main.main(Main.java:26)