Use TestCase helpers for assertions

Same two errors in py2 as in current `sprint-branch` HEAD.