Slight change in unittest to support Python 2.6 etc.