diff --git a/search/test/query2ast_test.py b/search/test/query2ast_test.py
index fc92e72..a122d99 100644
--- a/search/test/query2ast_test.py
+++ b/search/test/query2ast_test.py
@@ -1,7 +1,6 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file or at
-# https://developers.google.com/open-source/licenses/bsd
+# Copyright 2016 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
 
 """Tests for the query2ast module."""
 from __future__ import print_function
@@ -13,8 +12,8 @@
 import unittest
 import mock
 
-from proto import ast_pb2
-from proto import tracker_pb2
+from mrproto import ast_pb2
+from mrproto import tracker_pb2
 from search import query2ast
 from tracker import tracker_bizobj
 
@@ -751,7 +750,7 @@
         query2ast.ParseUserQuery(
             'modified>=' + val, '', BUILTIN_ISSUE_FIELDS,
             self.default_config)
-      self.assertEqual('Could not parse date: ' + val, cm.exception.message)
+      self.assertEqual('Could not parse date: ' + val, str(cm.exception))
 
   def testQueryToSubqueries_BasicQuery(self):
     self.assertEqual(['owner:me'], query2ast.QueryToSubqueries('owner:me'))