Avoid using assertGreater

This doesn't exist in python 2.6.

Change-Id: I8d41a568ac4c9fc7330077e6643b40eddc071f91
Merge "Avoid using assertGreater"