fix tests

BUG=None

Review URL: https://codereview.appspot.com/7304078