As part of doing that, fixed a unittest to work with python2.6. Change-Id: I575a8534bf008077c1a24a25336f1d711f742297