fixes to tests, updated pubspec

TBR

Review URL: https://codereview.chromium.org//196793025