Make all itag testing heuristic.

This makes tests still relevant on updates, and means that we don't have
to add the itag for each itag key (which would otherwise be needed on
Python 3+).
Make heuristic itag tests a little more loose.

There could be some false positives in the tests from the previous
commit.
Merge branch 'tests'